@@ -350,6 +350,7 @@ public void execute(Exchange exchange){
                 exchange.write(transformResponse(response));
             if(exchange.getMethod() != HttpMethod.WEBSOCKET)
                 exchange.close();
+            return;
         }catch(Throwable ex){
             try {
                 exchange.write(transformResponse(exceptionHandler.handle(exchange, ex)));
@@ -407,4 +408,7 @@ public org.eclipse.jetty.websocket.server.WebSocketHandler getInternalWebSocketH
         return webSocketHandler;
     }
 
+    public ExceptionHandler getExceptionHandler() {
+        return exceptionHandler;
+    }
 }
@@ -19,7 +19,11 @@ public void onConnect(Session session){
             return;
         }
         socket.setSession(session);
-        socket.getHandler().onConnect(socket);
+        try {
+            socket.getHandler().onConnect(socket);
+        }catch (Throwable t) {
+            socket.getExchange().getServer().getExceptionHandler().handle(socket.getExchange(), t);
+        }
     }
     @OnWebSocketMessage
     public void onMessage(Session session, String message){
@@ -28,14 +32,22 @@ public void onMessage(Session session, String message){
             session.close(500, "Server Error");
             return;
         }
-        socket.getHandler().onMessage(socket, message);
+        try {
+            socket.getHandler().onMessage(socket, message);
+        }catch (Throwable t) {
+            socket.getExchange().getServer().getExceptionHandler().handle(socket.getExchange(), t);
+        }
     }
     @OnWebSocketClose
     public void onClose(Session session, int code, String reason){
         WebSocket socket = webSockets.get(session.getUpgradeResponse().getHeader("X-Server-WSID"));
         if(socket != null){
+            try {
+                socket.getHandler().onClose(socket, code, reason);
+            }catch (Throwable t) {
+                socket.getExchange().getServer().getExceptionHandler().handle(socket.getExchange(), t);
+            }
             webSockets.remove(session.getUpgradeResponse().getHeader("X-Server-WSID"));
-            socket.getHandler().onClose(socket, code, reason);
         }
     }
 }
@@ -20,7 +20,9 @@ public Object handle(Exchange exchange) {
         InternalWebSocketAdapter.webSockets.put(id, new WebSocket(exchange, handler));
         try {
             exchange.getServer().getInternalWebSocketHandler().handle(exchange.getPath(), (Request) exchange.rawRequest(), exchange.rawRequest(), exchange.rawResponse());
-        } catch (IOException | ServletException ignored) {}
+        } catch (IOException | ServletException ignored) {
+            ignored.printStackTrace();
+        }
         return null;
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,7 @@ public void execute(Exchange exchange){`
`350`	`350`	`exchange.write(transformResponse(response));`
`351`	`351`	`if(exchange.getMethod() != HttpMethod.WEBSOCKET)`
`352`	`352`	`exchange.close();`
	`353`	`+ return;`
`353`	`354`	`}catch(Throwable ex){`
`354`	`355`	`try {`
`355`	`356`	`exchange.write(transformResponse(exceptionHandler.handle(exchange, ex)));`
`@@ -407,4 +408,7 @@ public org.eclipse.jetty.websocket.server.WebSocketHandler getInternalWebSocketH`
`407`	`408`	`return webSocketHandler;`
`408`	`409`	`}`
`409`	`410`
	`411`	`+ public ExceptionHandler getExceptionHandler() {`
	`412`	`+ return exceptionHandler;`
	`413`	`+ }`
`410`	`414`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,11 @@ public void onConnect(Session session){`
`19`	`19`	`return;`
`20`	`20`	`}`
`21`	`21`	`socket.setSession(session);`
`22`		`- socket.getHandler().onConnect(socket);`
	`22`	`+ try {`
	`23`	`+ socket.getHandler().onConnect(socket);`
	`24`	`+ }catch (Throwable t) {`
	`25`	`+ socket.getExchange().getServer().getExceptionHandler().handle(socket.getExchange(), t);`
	`26`	`+ }`
`23`	`27`	`}`
`24`	`28`	`@OnWebSocketMessage`
`25`	`29`	`public void onMessage(Session session, String message){`
`@@ -28,14 +32,22 @@ public void onMessage(Session session, String message){`
`28`	`32`	`session.close(500, "Server Error");`
`29`	`33`	`return;`
`30`	`34`	`}`
`31`		`- socket.getHandler().onMessage(socket, message);`
	`35`	`+ try {`
	`36`	`+ socket.getHandler().onMessage(socket, message);`
	`37`	`+ }catch (Throwable t) {`
	`38`	`+ socket.getExchange().getServer().getExceptionHandler().handle(socket.getExchange(), t);`
	`39`	`+ }`
`32`	`40`	`}`
`33`	`41`	`@OnWebSocketClose`
`34`	`42`	`public void onClose(Session session, int code, String reason){`
`35`	`43`	`WebSocket socket = webSockets.get(session.getUpgradeResponse().getHeader("X-Server-WSID"));`
`36`	`44`	`if(socket != null){`
	`45`	`+ try {`
	`46`	`+ socket.getHandler().onClose(socket, code, reason);`
	`47`	`+ }catch (Throwable t) {`
	`48`	`+ socket.getExchange().getServer().getExceptionHandler().handle(socket.getExchange(), t);`
	`49`	`+ }`
`37`	`50`	`webSockets.remove(session.getUpgradeResponse().getHeader("X-Server-WSID"));`
`38`		`- socket.getHandler().onClose(socket, code, reason);`
`39`	`51`	`}`
`40`	`52`	`}`
`41`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ public Object handle(Exchange exchange) {`
`20`	`20`	`InternalWebSocketAdapter.webSockets.put(id, new WebSocket(exchange, handler));`
`21`	`21`	`try {`
`22`	`22`	`exchange.getServer().getInternalWebSocketHandler().handle(exchange.getPath(), (Request) exchange.rawRequest(), exchange.rawRequest(), exchange.rawResponse());`
`23`		`- } catch (IOException \| ServletException ignored) {}`
	`23`	`+ } catch (IOException \| ServletException ignored) {`
	`24`	`+ ignored.printStackTrace();`
	`25`	`+ }`
`24`	`26`	`return null;`
`25`	`27`	`}`
`26`	`28`	`}`