--- old/hotspot/src/share/vm/oops/instanceKlass.cpp	2017-09-12 11:16:12.735297654 +0200
+++ new/hotspot/src/share/vm/oops/instanceKlass.cpp	2017-09-12 11:16:12.623295636 +0200
@@ -3865,8 +3865,8 @@
 #endif
 
 #define THROW_DVT_ERROR(s) \
-  Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_InternalError(), \
-      "DeriveValueType class '%s' %s", external_name(),(s)); \
+  Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_IncompatibleClassChangeError(), \
+      "ValueCapableClass class '%s' %s", external_name(),(s)); \
       return
 
 void InstanceKlass::create_value_capable_class(Handle class_loader, Handle protection_domain, TRAPS) {