1 files changed, 7 insertions, 1 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
index 609456c562a..f6f07d874d9 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JDiscFilterInvokerFilter.java
@@ -55,7 +55,13 @@ class JDiscFilterInvokerFilter implements Filter {
         HttpServletRequest httpRequest = (HttpServletRequest)request;
         HttpServletResponse httpResponse = (HttpServletResponse)response;
 
-        URI uri = HttpRequestFactory.getUri(httpRequest);
+        URI uri;
+        try {
+            uri = HttpRequestFactory.getUri(httpRequest);
+        } catch (RequestException e) {
+            httpResponse.sendError(e.getResponseStatus(), e.getMessage());
+            return;
+        }
 
         AtomicReference<Boolean> responseReturned = new AtomicReference<>(null);