--- a/src/hotspot/share/memory/metaspaceShared.cpp	Fri Oct 26 11:11:13 2018 +0800
+++ b/src/hotspot/share/memory/metaspaceShared.cpp	Thu Oct 25 21:40:17 2018 -0700
@@ -1646,12 +1646,11 @@
     } while (check_closure.made_progress());
 
     if (IgnoreUnverifiableClassesDuringDump) {
-      // This is useful when running JCK or SQE tests. You should not
-      // enable this when running real apps.
+      // IgnoreUnverifiableClassesDuringDump is enabled by default.
+      // Unverifiable classes will not be included in the CDS archive.
       SystemDictionary::remove_classes_in_error_state();
     } else {
-      tty->print_cr("Please remove the unverifiable classes from your class list and try again");
-      exit(1);
+      vm_exit_during_cds_dumping("Please remove the unverifiable classes from your class list and try again");
     }
   }
 }