--- a/src/hotspot/share/classfile/classLoaderData.cpp	Fri Sep 28 14:53:41 2018 -0700
+++ b/src/hotspot/share/classfile/classLoaderData.cpp	Mon Oct 01 00:52:37 2018 -0400
@@ -338,6 +338,11 @@
   for (Klass* k = OrderAccess::load_acquire(&_klasses); k != NULL; k = k->next_link()) {
     // Do not filter ArrayKlass oops here...
     if (k->is_array_klass() || (k->is_instance_klass() && InstanceKlass::cast(k)->is_loaded())) {
+#ifdef ASSERT
+      oop m = k->java_mirror();
+      assert(m != NULL, "NULL mirror");
+      assert(m->is_a(SystemDictionary::Class_klass()), "invalid mirror");
+#endif
       klass_closure->do_klass(k);
     }
   }