--- a/src/hotspot/share/interpreter/rewriter.cpp	Fri Mar 09 12:38:54 2018 -0800
+++ b/src/hotspot/share/interpreter/rewriter.cpp	Fri Mar 09 13:36:39 2018 -0800
@@ -111,12 +111,12 @@
   if (HAS_PENDING_EXCEPTION) {
     MetadataFactory::free_metadata(loader_data, cache);
     _pool->set_cache(NULL);  // so the verifier isn't confused
+  } else {
+    DEBUG_ONLY(
+    if (DumpSharedSpaces) {
+      cache->verify_just_initialized();
+    })
   }
-
-  DEBUG_ONLY(
-  if (DumpSharedSpaces) {
-    cache->verify_just_initialized();
-  })
 }