diff -r 083e731da31a -r 4e9667589c43 src/hotspot/share/classfile/javaClasses.cpp
--- a/src/hotspot/share/classfile/javaClasses.cpp	Thu Aug 16 10:20:00 2018 -0700
+++ b/src/hotspot/share/classfile/javaClasses.cpp	Thu Aug 16 17:29:22 2018 -0400
@@ -1038,6 +1038,7 @@
     if (m != NULL) {
       // Update the field at _array_klass_offset to point to the relocated array klass.
       oop archived_m = MetaspaceShared::archive_heap_object(m, THREAD);
+      assert(archived_m != NULL, "sanity");
       Klass *ak = (Klass*)(archived_m->metadata_field(_array_klass_offset));
       assert(ak != NULL || t == T_VOID, "should not be NULL");
       if (ak != NULL) {