--- a/OldLauncher.st	Sat Jan 31 14:18:55 2015 +0100
+++ b/OldLauncher.st	Sat Jan 31 14:24:30 2015 +0100
@@ -9,8 +9,9 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
+"{ Package: 'stx:libtool' }"
 
-"{ Package: 'stx:libtool' }"
+"{ NameSpace: Smalltalk }"
 
 StandardSystemView subclass:#OldLauncher
 	instanceVariableNames:'myMenu logoLabel'
@@ -89,13 +90,20 @@
 
     cls := (Smalltalk at:className).
     cls isNil ifTrue:[
-        cls := Demos at:className.
+        Demos notNil ifTrue:[
+            cls := Demos at:className.
+        ].
         cls isNil ifTrue:[
-            cls := Games at:className.
+            Games notNil ifTrue:[
+                cls := Games at:className.
+            ].
+            cls isNil ifTrue:[
+                self warn:'Demo not found: ', className.
+                ^ self.
+            ].
         ].
     ].
     cls open
-
 !
 
 startAnimation
@@ -1002,6 +1010,10 @@
 !
 
 startWindowTreeView
+    WindowTreeView isNil ifTrue:[
+        self warn:'Class not loaded: WindowTreeView'.
+        ^ self.
+    ].
     WindowTreeView open
 !
 
@@ -1046,5 +1058,6 @@
 !OldLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.42 2001-09-10 13:45:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.43 2015-01-31 13:24:30 cg Exp $'
 ! !
+