--- old/src/hotspot/share/memory/metaspaceShared.cpp	2018-10-30 15:17:22.372866283 -0700
+++ new/src/hotspot/share/memory/metaspaceShared.cpp	2018-10-30 15:17:22.025833631 -0700
@@ -1645,13 +1645,8 @@
       ClassLoaderDataGraph::unlocked_loaded_classes_do(&check_closure);
     } while (check_closure.made_progress());
 
-    if (IgnoreUnverifiableClassesDuringDump) {
-      // IgnoreUnverifiableClassesDuringDump is enabled by default.
-      // Unverifiable classes will not be included in the CDS archive.
-      SystemDictionary::remove_classes_in_error_state();
-    } else {
-      vm_exit_during_cds_dumping("Please remove the unverifiable classes from your class list and try again");
-    }
+    // Unverifiable classes will not be included in the CDS archive.
+    SystemDictionary::remove_classes_in_error_state();
   }
 }