--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSignature.java	Thu May 12 14:24:15 2016 +0200
+++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotSignature.java	Thu May 12 11:06:49 2016 +0200
@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import jdk.vm.ci.common.JVMCIError;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -104,7 +105,7 @@
             case 'Z':
                 break;
             default:
-                throw new InternalError(String.format("Invalid character at index %d in signature: %s", cur, signature));
+                throw new JVMCIError("Invalid character at index %d in signature: %s", cur, signature);
         }
         return cur;
     }