--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp	Wed Oct 16 09:20:23 2013 +0200
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp	Wed Oct 16 14:32:05 2013 -0400
@@ -248,7 +248,7 @@
 void LinkResolver::lookup_instance_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
   Method* result_oop = klass->uncached_lookup_method(name, signature);
   result = methodHandle(THREAD, result_oop);
-  while (!result.is_null() && result->is_static()) {
+  while (!result.is_null() && result->is_static() && result->method_holder()->super() != NULL) {
     klass = KlassHandle(THREAD, result->method_holder()->super());
     result = methodHandle(THREAD, klass->uncached_lookup_method(name, signature));
   }