--- a/JavaClass.st	Mon Feb 09 18:39:38 2015 +0100
+++ b/JavaClass.st	Tue Feb 10 14:50:55 2015 +0100
@@ -2196,15 +2196,17 @@
             method := cls compiledMethodAt:sel.
             method notNil ifTrue:[ ^ method ].
             cls isInterface ifFalse:[
-                cls superclass ~~ JavaObject ifTrue:[queue add: cls superclass]
+                cls superclass notNil ifTrue:[queue add: cls superclass]
             ].
-            queue addAll: cls interfaces.
+            cls isJavaClass ifTrue:[  
+                queue addAll: cls interfaces.
+            ].
         ].
     ].
     "/cls ifNotNil:[^super lookupMethodFor: selector].
     ^ nil
 
-    "Modified: / 19-10-2011 / 17:19:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 04-02-2015 / 15:14:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 performStatic:selector
@@ -3513,11 +3515,11 @@
 !JavaClass class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.137 2015-01-28 02:10:50 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.138 2015-02-10 13:50:55 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.137 2015-01-28 02:10:50 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.138 2015-02-10 13:50:55 vrany Exp $'
 !
 
 version_SVN