--- old/src/share/vm/prims/whitebox.cpp	Thu Mar 26 05:21:53 2015
+++ new/src/share/vm/prims/whitebox.cpp	Thu Mar 26 05:21:52 2015
@@ -1220,7 +1220,7 @@
   if (res == NULL) {
     tty->print_cr("Invalid layout of %s at %s", ik->external_name(),
         name_symbol->as_C_string());
-    fatal("Invalid layout of preloaded class");
+    vm_exit_during_initialization("Invalid layout of preloaded class");
   }
 
   //fetch the field at the offset we've found