1 files changed, 8 insertions, 1 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java
index b4992fb519b..698c37244a1 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/RestApi.java
@@ -210,7 +210,7 @@ public class RestApi extends LoggingRequestHandler {
             }
 
             String condition = request.getProperty(CONDITION_PARAMETER_NAME);
-            Optional<String> route = Optional.ofNullable(request.getProperty(ROUTE_PARAMETER_NAME));
+            Optional<String> route = Optional.ofNullable(nonEmpty(request.getProperty(ROUTE_PARAMETER_NAME), ROUTE_PARAMETER_NAME));
 
             Optional<ObjectNode> resultJson = Optional.empty();
             switch (request.getMethod()) {
@@ -351,6 +351,13 @@ public class RestApi extends LoggingRequestHandler {
         return builder.toString();
     }
 
+
+    private String nonEmpty(String value, String name) {
+        if (value != null && value.isEmpty())
+            throw new IllegalArgumentException("'" + name + "' cannot be empty");
+        return value;
+    }
+
     private static long parseAndValidateVisitNumericId(String value) {
         try {
             return Long.parseLong(value);