*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java	Mon Aug 28 14:09:44 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.verifier/src/org/graalvm/compiler/replacements/verifier/ClassSubstitutionVerifier.java	Mon Aug 28 14:09:44 2017

*** 93,106 ****
--- 93,109 ----
  
          if (classNames.length != 0) {
              TypeElement typeElement = null;
              for (String className : classNames) {
                  typeElement = env.getElementUtils().getTypeElement(className);
+                 if (typeElement != null) {
+                     break;
+                 }
+             }
              if (typeElement == null && !optional) {
                  env.getMessager().printMessage(Kind.ERROR, String.format("The class '%s' was not found on the classpath.", stringValue), sourceElement, classSubstition, stringValue);
              }
              }
  
              return typeElement;
          }
  
          if (!optional) {