diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketConfiguration.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketConfiguration.java
index 17f0772c5b31..039711e63a6a 100644
--- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketConfiguration.java
+++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/NativeWebSocketConfiguration.java
@@ -22,6 +22,7 @@
 import javax.servlet.ServletContext;
 
 import org.eclipse.jetty.http.pathmap.MappedResource;
+import org.eclipse.jetty.http.pathmap.MatchedResource;
 import org.eclipse.jetty.http.pathmap.PathMappings;
 import org.eclipse.jetty.http.pathmap.PathSpec;
 import org.eclipse.jetty.http.pathmap.RegexPathSpec;
@@ -82,7 +83,10 @@ public WebSocketServerFactory getFactory()
      */
     public MappedResource<WebSocketCreator> getMatch(String target)
     {
-        return this.mappings.getMatched(target).getMappedResource();
+        MatchedResource<WebSocketCreator> matched = this.mappings.getMatched(target);
+        if (matched == null)
+            return null;
+        return matched.getMappedResource();
     }
 
     /**