--- a/StandaloneStartup.st	Mon May 25 15:46:30 2009 +0200
+++ b/StandaloneStartup.st	Mon May 25 15:49:14 2009 +0200
@@ -548,10 +548,12 @@
     Smalltalk isStandAloneApp ifTrue:[
         Smalltalk at:#Debugger put:nil.
         Smalltalk at:#Inspector put:nil.
-        NewLauncher allPrivateClasses do:[:cls |
-            Smalltalk at:(cls name) put:nil.
+        NewLauncher notNil ifTrue:[
+            NewLauncher allPrivateClasses do:[:cls |
+                Smalltalk at:(cls name) put:nil.
+            ].
+            Smalltalk at:#NewLauncher put:nil.
         ].
-        Smalltalk at:#NewLauncher put:nil.
         self redirectStandardStreams.
     ].
 
@@ -646,7 +648,7 @@
 !StandaloneStartup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/StandaloneStartup.st,v 1.32 2009-03-04 15:36:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/StandaloneStartup.st,v 1.33 2009-05-25 13:49:14 stefan Exp $'
 ! !
 
 StandaloneStartup initialize!