--- old/src/share/vm/prims/jni.cpp	2016-05-11 09:26:22.521458232 +0200
+++ new/src/share/vm/prims/jni.cpp	2016-05-11 09:26:22.259457382 +0200
@@ -3988,7 +3988,11 @@
         if (BootstrapJVMCI) {
           JavaThread* THREAD = thread;
           JVMCICompiler* compiler = JVMCICompiler::instance(CATCH);
-          compiler->bootstrap();
+          compiler->bootstrap(THREAD);
+          if (HAS_PENDING_EXCEPTION) {
+            HandleMark hm;
+            vm_exit_during_initialization(Handle(THREAD, PENDING_EXCEPTION));
+          }
         }
       }
     }