--- a/ClassDescription.st	Fri Mar 16 14:38:01 2001 +0100
+++ b/ClassDescription.st	Mon Mar 19 10:17:58 2001 +0100
@@ -178,11 +178,12 @@
         UpdateChangeFileQuerySignal notifierString:'asking if changeFile update is wanted'.
         UpdateChangeFileQuerySignal handlerBlock:[:ex | ex proceedWith:UpdatingChanges].
 
-        NameSpaceQuerySignal := QuerySignal new.
-        NameSpaceQuerySignal nameClass:self message:#nameSpaceQuerySignal.
-        NameSpaceQuerySignal notifierString:'asking for nameSpace'.
-        NameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:Smalltalk defaultNameSpace].
-
+        NameSpaceQuerySignal isNil ifTrue:[
+            NameSpaceQuerySignal := QuerySignal new.
+            NameSpaceQuerySignal nameClass:self message:#nameSpaceQuerySignal.
+            NameSpaceQuerySignal notifierString:'asking for nameSpace'.
+            NameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:Smalltalk defaultNameSpace].
+        ].
         UsedNameSpaceQuerySignal := QuerySignal new.
         UsedNameSpaceQuerySignal nameClass:self message:#usedNameSpaceQuerySignal.
         UsedNameSpaceQuerySignal notifierString:'asking for used nameSpaced'.
@@ -333,6 +334,12 @@
     "return the signal used as an upQuery for the current nameSpace.
      Will be used when filing in code"
 
+    NameSpaceQuerySignal isNil ifTrue:[
+        NameSpaceQuerySignal := QuerySignal new.
+        NameSpaceQuerySignal nameClass:self message:#nameSpaceQuerySignal.
+        NameSpaceQuerySignal notifierString:'asking for nameSpace'.
+        NameSpaceQuerySignal handlerBlock:[:ex | ex proceedWith:Smalltalk defaultNameSpace].
+    ].
     ^ NameSpaceQuerySignal
 
     "
@@ -3797,6 +3804,6 @@
 !ClassDescription class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.119 2001-01-29 19:28:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassDescription.st,v 1.120 2001-03-19 09:17:58 cg Exp $'
 ! !
 ClassDescription initialize!