--- a/OldLauncher.st	Sun Jan 12 23:30:25 2014 +0000
+++ b/OldLauncher.st	Wed Apr 01 10:38:01 2015 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 StandardSystemView subclass:#OldLauncher
 	instanceVariableNames:'myMenu logoLabel'
 	classVariableNames:''
@@ -37,13 +39,10 @@
 documentation
 "
     WARNING:
-        This is a very old part of the ST/X system, and no
-        longer maintained.
-        This used to be the launcher a few years ago.
-        It has been replaced by the Launcher, which itself
-        got obsoleted by the NewLauncher.
-        (However, some may still like it, since it takes up less
-         screen real-estate ;-)
+        This is a very old part of the ST/X system, and no longer maintained.
+        This used to be the launcher many years ago (in the early 90s).
+        It has been replaced by the Launcher, 
+        which itself got obsoleted by the NewLauncher.
 
     OldLauncher allows startup of smalltalk applications.
 
@@ -88,13 +87,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
@@ -1001,6 +1007,10 @@
 !
 
 startWindowTreeView
+    WindowTreeView isNil ifTrue:[
+        self warn:'Class not loaded: WindowTreeView'.
+        ^ self.
+    ].
     WindowTreeView open
 !
 
@@ -1045,11 +1055,10 @@
 !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.44 2015-01-31 13:25:56 cg Exp $'
 !
 
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libtool/OldLauncher.st,v 1.44 2015-01-31 13:25:56 cg Exp $'
 ! !