SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/remote/ErrorCodes.java‎
Lines changed: 5 additions & 3 deletions b/‎java/client/src/org/openqa/selenium/remote/ErrorCodes.java‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎java/client/test/org/openqa/selenium/remote/JsonToBeanConverterTest.java‎
Lines changed: 8 additions & 0 deletions b/‎java/client/test/org/openqa/selenium/remote/JsonToBeanConverterTest.java‎
Lines changed: 8 additions & 0 deletions
@@ -51,6 +51,7 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -127,15 +128,16 @@ public int toStatus(String webdriverState, Optional<Integer> httpStatus) {
       return 0;
     }
 
-    Set<KnownError> possibleMatches = KNOWN_ERRORS.stream()
+    List<KnownError> possibleMatches = KNOWN_ERRORS.stream()
       .filter(knownError -> knownError.getW3cCode().equals(webdriverState))
       .filter(KnownError::isCanonicalForW3C)
-      .collect(Collectors.toSet());
+      .sorted((a,b) -> Integer.compare(a.getJsonCode(),b.getJsonCode()))
+      .collect(Collectors.toList());
 
     if (possibleMatches.isEmpty()) {
       return UNHANDLED_ERROR;
     }
-    KnownError error = Iterables.getOnlyElement(possibleMatches);
+    KnownError error = possibleMatches.get(0);
     if (httpStatus.isPresent() && httpStatus.get() != error.getW3cHttpStatus()) {
       log.info(String.format(
         "HTTP Status: '%d' -> incorrect JSON status mapping for '%s' (%d expected)",
 
@@ -404,6 +404,14 @@ public void testShouldRecognizeStringStatus() {
     assertEquals("cheese", value);
   }
 
+  @Test
+  public void testShouldConvertInvalidSelectorError() {
+    Response response = new JsonToBeanConverter()
+      .convert(Response.class, "{\"state\":\"invalid selector\",\"message\":\"invalid xpath selector\"}");
+    assertEquals(32, response.getStatus().intValue());
+    assertEquals(new ErrorCodes().toState(32), response.getState());
+  }
+
   @Test
   public void testShouldRecognizeStringState() {
     Response response = new JsonToBeanConverter()