--- a/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp	Fri Mar 09 12:03:20 2018 -0500
+++ b/src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp	Thu Feb 08 09:23:49 2018 +0100
@@ -201,7 +201,12 @@
   __ br(rscratch1);
 
   __ bind(L_no_such_interface);
-  __ far_jump(RuntimeAddress(StubRoutines::throw_IncompatibleClassChangeError_entry()));
+  // Handle IncompatibleClassChangeError in itable stubs.
+  // More detailed error message.
+  // We force resolving of the call site by jumping to the "handle
+  // wrong method" stub, and so let the interpreter runtime do all the
+  // dirty work.
+  __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
 
   __ flush();