--- a/ClassDefinitionChange.st	Tue Mar 24 19:00:15 2015 +0100
+++ b/ClassDefinitionChange.st	Tue Mar 24 19:01:04 2015 +0100
@@ -206,6 +206,7 @@
      Notice that className always returns the full name (incl. any owner prefix)"
 
     self isPrivateClassDefinitionChange ifFalse:[^ self className].
+    owningClassName isNil ifTrue:[^ self className].
 
     (className startsWith:(owningClassName,'::')) ifTrue:[
         ^ className copyFrom:(owningClassName size + 2 + 1).
@@ -532,7 +533,7 @@
             tab;
             nextPutAll:'poolDictionaries:';
             nextPutLine:(poolDictionaries ? '') storeString.
-        self isPrivateClassDefinitionChange ifTrue:[
+        (self isPrivateClassDefinitionChange and:[owningClassName notNil]) ifTrue:[
             ownerNameUsed := self owningClassName.    
             (nsOrNil isNil or:[nsOrNil ~~ nameSpaceName]) ifTrue:[
                 (nsOrNil ? nameSpaceName) notNil ifTrue:[
@@ -896,11 +897,11 @@
 !ClassDefinitionChange class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.95 2015-02-26 01:07:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.96 2015-03-24 18:01:04 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.95 2015-02-26 01:07:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.96 2015-03-24 18:01:04 cg Exp $'
 !
 
 version_HG
@@ -909,6 +910,6 @@
 !
 
 version_SVN
-    ^ '$Id: ClassDefinitionChange.st,v 1.95 2015-02-26 01:07:10 cg Exp $'
+    ^ '$Id: ClassDefinitionChange.st,v 1.96 2015-03-24 18:01:04 cg Exp $'
 ! !