--- a/Class.st	Mon Mar 03 11:17:46 2003 +0100
+++ b/Class.st	Mon Mar 03 11:43:03 2003 +0100
@@ -2129,10 +2129,11 @@
                     "/ if the superclass resides in Smalltalk,
                     "/ suppress prefix; otherwise, use full prefix.
                     (superclassNamespace notNil 
-                    and:[superclassNamespace ~~ Smalltalk]) ifTrue:[
-                        (owner notNil 
-                        and:[owner topOwningClass nameSpace == superclass topOwningClass "owningClass" nameSpace])
-                        ifTrue:[
+                     and:[superclassNamespace ~~ Smalltalk]) ifTrue:[
+                        (owner notNil
+                         and:[(topOwner := owner topOwningClass) notNil
+                         and:[topOwner nameSpace == superclass topOwningClass "owningClass" nameSpace
+                        ]]) ifTrue:[
                             s := superNameWithoutNameSpacePrefix
                         ] ifFalse:[
                             s := superclass name
@@ -4788,5 +4789,5 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.423 2003-03-02 18:42:46 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.424 2003-03-03 10:43:03 stefan Exp $'
 ! !