--- old/src/hotspot/share/oops/instanceKlass.cpp	2017-09-25 13:08:56.804794349 -0400
+++ new/src/hotspot/share/oops/instanceKlass.cpp	2017-09-25 13:08:56.270837475 -0400
@@ -285,6 +285,9 @@
     java_lang_Class::set_klass(java_mirror(), NULL);
   }
 
+  // Also remove mirror from handles
+  loader_data->remove_handle(_java_mirror);
+
   // Need to take this class off the class loader data list.
   loader_data->remove_class(this);