--- old/src/share/vm/runtime/arguments.cpp	2016-02-11 23:07:49.621859961 -0800
+++ new/src/share/vm/runtime/arguments.cpp	2016-02-11 23:07:49.476846642 -0800
@@ -2309,6 +2309,19 @@
 //===========================================================================================================
 // Parsing of main arguments
 
+// Check consistency of JVMCI args
+#if INCLUDE_JVMCI
+bool Arguments::check_jvmci_flag_consistency() {
+
+  if (!EnableJVMCI && UseJVMCICompiler) {
+    jio_fprintf(defaultStream::error_stream(), "EnableJVMCI must be enabled\n"
+                "Improperly specified VM option 'UseJVMCICompiler'\n");
+    return false;
+  }
+  return true;
+}
+#endif
+
 // Check consistency of GC selection
 bool Arguments::check_gc_consistency() {
   // Ensure that the user has not selected conflicting sets
@@ -2405,6 +2418,7 @@
 #endif
   }
 #if INCLUDE_JVMCI
+  status = status && check_jvmci_flag_consistency();
   if (EnableJVMCI) {
     if (!ScavengeRootsInCode) {
       warning("forcing ScavengeRootsInCode non-zero because JVMCI is enabled");