--- a/src/hotspot/share/memory/metaspace.cpp	Thu Jul 12 16:30:47 2018 +0200
+++ b/src/hotspot/share/memory/metaspace.cpp	Wed Jul 11 16:11:10 2018 +0200
@@ -1260,7 +1260,9 @@
       tty->print_cr("Please increase MaxMetaspaceSize (currently " SIZE_FORMAT " bytes).", MaxMetaspaceSize);
       vm_exit(1);
     }
-    report_metadata_oome(loader_data, word_size, type, mdtype, CHECK_NULL);
+    report_metadata_oome(loader_data, word_size, type, mdtype, THREAD);
+    assert(HAS_PENDING_EXCEPTION, "sanity");
+    return NULL;
   }
 
   // Zero initialize.