diff --git a/java/src/org/openqa/selenium/remote/ElementLocation.java b/java/src/org/openqa/selenium/remote/ElementLocation.java
index c44d10364bfbe..3d0db05bf55c6 100644
--- a/java/src/org/openqa/selenium/remote/ElementLocation.java
+++ b/java/src/org/openqa/selenium/remote/ElementLocation.java
@@ -138,6 +138,9 @@ WebElement findElement(
           BiFunction<String, Object, CommandPayload> createPayload,
           By locator) {
         WebElement element = locator.findElement(context);
+        if (element == null) {
+          throw new NoSuchElementException("Unable to find element with locator " + locator);
+        }
         return massage(driver, context, element, locator);
       }
 
@@ -148,6 +151,10 @@ List<WebElement> findElements(
           BiFunction<String, Object, CommandPayload> createPayload,
           By locator) {
         List<WebElement> elements = locator.findElements(context);
+        if (elements == null) {
+          return Collections.emptyList();
+        }
+
         return elements.stream()
             .map(e -> massage(driver, context, e, locator))
             .collect(Collectors.toList());