--- a/src/hotspot/share/oops/instanceKlass.cpp	Fri Sep 29 10:44:58 2017 +0200
+++ b/src/hotspot/share/oops/instanceKlass.cpp	Tue Oct 03 16:42:04 2017 -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);