--- a/hotspot/src/share/vm/runtime/thread.cpp	Mon Dec 07 15:42:47 2015 +0100
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Sun Dec 13 22:51:13 2015 +0100
@@ -3628,7 +3628,7 @@
 
   // initialize compiler(s)
 #if defined(COMPILER1) || defined(COMPILER2) || defined(SHARK) || INCLUDE_JVMCI
-  CompileBroker::compilation_init();
+  CompileBroker::compilation_init(CHECK_JNI_ERR);
 #endif
 
   // Pre-initialize some JSR292 core classes to avoid deadlock during class loading.