--- a/JavaClassRegistry.st	Mon Mar 04 20:10:26 2013 +0100
+++ b/JavaClassRegistry.st	Mon Mar 04 22:16:45 2013 +0100
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaClassRegistry class methodsFor:'instance creation'!
 
 for: aJavaVM
@@ -70,7 +69,6 @@
     "Modified (format): / 30-10-2011 / 12:07:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'accessing'!
 
 classForName: className loader: classLoader ifAbsent: aBlock 
@@ -108,7 +106,7 @@
     class := self classNamed: className loader: classLoader.
     class notNil ifTrue: [ ^ class ].
     "if java vm is booted, nil class loader means system class loader, lets check it too"
-    (vm booted and: [classLoader isNil]) ifTrue: [
+    (vm notNil and:[vm booted and: [classLoader isNil]]) ifTrue: [
         class := self classNamed: className loader: vm systemClassLoader. 
         class notNil ifTrue: [^class]
     ].
@@ -194,7 +192,6 @@
     "Created: / 16-08-2012 / 17:32:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'class loading'!
 
 loadFile: aFilename 
@@ -244,7 +241,6 @@
     "Modified: / 30-10-2011 / 12:24:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'enumerating'!
 
 classesDo: aBlock
@@ -258,7 +254,6 @@
     "Created: / 23-10-2011 / 20:13:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'helpers'!
 
 addClassLoader: aJavaClassLoader
@@ -270,7 +265,6 @@
     ^loaders at: classLoader ifAbsent: [nil].
 ! !
 
-
 !JavaClassRegistry methodsFor:'initialization'!
 
 flush
@@ -302,7 +296,6 @@
     "Modified (format): / 07-02-2013 / 17:36:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry methodsFor:'registering'!
 
 registerClass: newClass
@@ -472,16 +465,15 @@
     "Created: / 02-01-2013 / 17:01:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaClassRegistry class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassRegistry.st,v 1.2 2013-02-25 11:15:31 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaClassRegistry.st,v 1.3 2013-03-04 21:16:45 cg Exp $'
 !
 
 version_HG
 
-    ^ '$Changeset: <not expanded> $'
+    ^ '§Changeset: <not expanded> §'
 !
 
 version_SVN