--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java	Thu May 12 14:24:15 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java	Thu May 12 11:06:49 2016 +0200
@@ -41,6 +41,7 @@
 import jdk.vm.ci.code.CompilationRequestResult;
 import jdk.vm.ci.code.CompiledCode;
 import jdk.vm.ci.code.InstalledCode;
+import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.hotspot.services.HotSpotJVMCICompilerFactory;
 import jdk.vm.ci.hotspot.services.HotSpotVMEventListener;
 import jdk.vm.ci.inittimer.InitTimer;
@@ -138,7 +139,7 @@
                     } else if (type == String.class) {
                         this.value = propertyValue;
                     } else {
-                        throw new InternalError("Unexpected option type " + type);
+                        throw new JVMCIError("Unexpected option type " + type);
                     }
                     this.isDefault = false;
                 }
@@ -188,7 +189,7 @@
             }
         }
 
-        throw new InternalError(String.format("No JVMCI runtime available for the %s architecture", architecture));
+        throw new JVMCIError("No JVMCI runtime available for the %s architecture", architecture);
     }
 
     /**