diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 74c5c15..e36384e 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -5044,7 +5044,11 @@
           }
           break;
         case kSuper:
-          ThrowNoSuchMethodError(type, klass, name, signature);
+          if (resolved != nullptr) {
+            ThrowIncompatibleClassChangeError(type, kDirect, resolved, referrer.Get());
+          } else {
+            ThrowNoSuchMethodError(type, klass, name, signature);
+          }
           break;
         case kVirtual:
           if (resolved != nullptr) {