--- a/ClassChange.st	Sun Jan 26 15:05:36 2003 +0100
+++ b/ClassChange.st	Sun Jan 26 15:09:17 2003 +0100
@@ -166,11 +166,13 @@
 !ClassChange methodsFor:'queries'!
 
 cutNameSpaceOf:aString
-    (aString startsWith:'Kernel.') ifTrue:[
-        ^ aString copyFrom:'Kernel.' size+1
-    ].
-    (aString startsWith:'Core.') ifTrue:[
-        ^ aString copyFrom:'Core.' size+1
+    aString notNil ifTrue:[
+        (aString startsWith:'Kernel.') ifTrue:[
+            ^ aString copyFrom:'Kernel.' size+1
+        ].
+        (aString startsWith:'Core.') ifTrue:[
+            ^ aString copyFrom:'Core.' size+1
+        ].
     ].
     ^ aString
 !
@@ -182,5 +184,5 @@
 !ClassChange class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.30 2003-01-26 14:05:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.31 2003-01-26 14:09:17 cg Exp $'
 ! !