diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java b/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java
index c706bbf..a777ba7 100644
--- a/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java
+++ b/org.springsource.loaded/src/main/java/org/springsource/loaded/TypeRegistry.java
@@ -561,6 +561,9 @@ public class TypeRegistry {
 	 * @return true if the type should be considered reloadable
 	 */
 	private boolean couldBeReloadable(String slashedName) {
+		if (slashedName==null) {
+			return false;
+		}
 		if (slashedName.startsWith("java")) {
 			return false;
 		}
diff --git a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java b/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
index c333186..4594a18 100644
--- a/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
+++ b/org.springsource.loaded/src/main/java/org/springsource/loaded/agent/SpringLoadedPreProcessor.java
@@ -409,7 +409,7 @@ public class SpringLoadedPreProcessor implements Constants {
 	}
 
 	private static boolean needsClientSideRewriting(String slashedClassName) {
-		if (slashedClassName.startsWith("org/springsource/loaded")) {
+		if (slashedClassName!=null && slashedClassName.charAt(0)=='o' && slashedClassName.startsWith("org/springsource/loaded")) {
 			return false;
 		}
 		return true;