--- a/Metaclass.st	Fri Oct 05 10:12:39 2007 +0200
+++ b/Metaclass.st	Mon Oct 08 11:18:29 2007 +0200
@@ -489,7 +489,8 @@
                          and:[superclassNamespace ~~ Smalltalk]) ifTrue:[
                             (owner notNil
                              and:[(topOwner := owner topOwningClass) notNil
-                             and:[topOwner nameSpace == superclass topOwningClass "owningClass" nameSpace
+                             and:[superclass topOwningClass isNil
+                                  or:[topOwner nameSpace == superclass topOwningClass "owningClass" nameSpace]
                             ]]) ifTrue:[
                                 s := superNameWithoutNameSpacePrefix
                             ] ifFalse:[
@@ -580,9 +581,9 @@
     ].
     aStream cr
 
-    "Created: / 4.1.1997 / 20:38:16 / cg"
-    "Modified: / 8.8.1997 / 10:59:50 / cg"
-    "Modified: / 18.3.1999 / 18:15:46 / stefan"
+    "Created: / 04-01-1997 / 20:38:16 / cg"
+    "Modified: / 18-03-1999 / 18:15:46 / stefan"
+    "Modified: / 08-10-2007 / 11:19:43 / cg"
 !
 
 fileOutClassInstVarDefinitionOn:aStream withNameSpace:withNameSpace
@@ -845,7 +846,7 @@
 !Metaclass class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.198 2007-03-26 12:14:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.199 2007-10-08 09:18:29 cg Exp $'
 ! !
 
 Metaclass initialize!