--- a/Smalltalk.st	Wed Jul 02 12:47:15 2014 +0200
+++ b/Smalltalk.st	Thu Jul 03 12:59:02 2014 +0200
@@ -227,17 +227,17 @@
      right after startup, usually immediately followed by Smalltalk>>start.
 
      Notice:
-	this is NOT called when an image is restarted; in this
-	case the show starts in Smalltalk>>restart."
+        this is NOT called when an image is restarted; in this
+        case the show starts in Smalltalk>>restart."
 
     Compiler := ByteCodeCompiler.
     Compiler isNil ifTrue:[
-	"
-	 ByteCodeCompiler is not in the system (i.e. has not been linked in)
-	 this allows at least immediate evaluations for runtime systems without compiler
-	 NOTICE: a parser is always needed, otherwise we cannot read resource files etc.
-	"
-	Compiler := Parser
+        "
+         ByteCodeCompiler is not in the system (i.e. has not been linked in)
+         this allows at least immediate evaluations for runtime systems without compiler
+         NOTICE: a parser is always needed, otherwise we cannot read resource files etc.
+        "
+        Compiler := Parser
     ].
 
     "/
@@ -270,14 +270,11 @@
     self initSystemPath.
 
     "/
-    "/ another one, to be initialized before others
-    "/
-    ProcessorScheduler initialize.
-
-    "/
     "/ in case, someone needs the objectFileLoader early
     "/
-    ObjectFileLoader initialize.
+    ObjectFileLoader notNil ifTrue:[
+        ObjectFileLoader initialize.
+    ].
 
     "/
     "/ now, finally, initialize all other classes
@@ -292,7 +289,9 @@
     "/ just to make sure: if any prefs affect any resources,
     "/ flush them here, so they are reread in any case.
     "/ required for some apps, for example to show the menu correctly (see launcher's help menu)
-    ApplicationModel flushAllClassResources.
+    ApplicationModel notNil ifTrue:[
+        ApplicationModel flushAllClassResources.
+    ].
 
     "/
     "/ give classes a chance to perform 2nd-level initialization
@@ -8258,13 +8257,14 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1084 2014-06-30 15:22:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1085 2014-07-03 10:59:02 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1084 2014-06-30 15:22:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1085 2014-07-03 10:59:02 cg Exp $'
 !
 
 version_SVN
     ^ '$ Id: Smalltalk.st 10648 2011-06-23 15:55:10Z vranyj1  $'
 ! !
+