--- a/src/JavaVM.st	Mon Aug 22 10:39:49 2011 +0000
+++ b/src/JavaVM.st	Mon Aug 22 14:47:57 2011 +0000
@@ -14587,7 +14587,7 @@
     method := self reflection methodForJavaMethodObject: m.
 
 
-    obj isNil ifTrue:[
+    (obj isNil and:[method isStatic not]) ifTrue:[
         self throwNullPointerException.
         ^nil.            
     ].
@@ -14618,8 +14618,8 @@
 
     "Created: / 06-02-2011 / 00:00:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 28-02-2011 / 16:57:31 / Marcel Hlopko <hlopik@gmail.com>"
-    "Modified: / 14-08-2011 / 23:04:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 19-08-2011 / 15:06:00 / cg"
+    "Modified: / 22-08-2011 / 15:45:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 _sun_reflect_Reflection_getCallerClass: aJavaContext
@@ -16326,7 +16326,7 @@
 !JavaVM class methodsFor:'documentation'!
 
 version
-    ^ '$Id: /cvs/stx/stx/libjava/JavaVM.st,v 1.185 2011/08/19 13:11:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaVM.st,v 1.185 2011/08/19 13:11:30 cg Exp $'
 !
 
 version_CVS
@@ -16337,4 +16337,4 @@
     ^ '$Id: JavaVM.st,v 1.184 2011/08/18 18:42:48 vrany Exp $'
 ! !
 
-JavaVM initialize!
\ No newline at end of file
+JavaVM initialize!