1 files changed, 19 insertions, 0 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index d172a5331..63d80a7f3 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -15,10 +15,18 @@
  */
 package org.traccar.web;
 
+import java.io.IOException;
+import java.io.Writer;
 import java.net.InetSocketAddress;
 import javax.naming.InitialContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
+
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -28,6 +36,7 @@ import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.traccar.Config;
 import org.traccar.api.CorsResponseFilter;
+import org.traccar.api.ResourceErrorHandler;
 import org.traccar.api.SecurityRequestFilter;
 import org.traccar.api.resource.DeviceResource;
 import org.traccar.api.resource.PositionResource;
@@ -76,6 +85,15 @@ public class WebServer {
                 break;
         }
         server.setHandler(handlers);
+
+        server.addBean(new ErrorHandler() {
+            @Override
+            protected void handleErrorPage(
+                    HttpServletRequest request, Writer writer, int code, String message) throws IOException {
+                writer.write("<!DOCTYPE<html><head><title>Error</title></head><html><body>"
+                        + code + " - " + HttpStatus.getMessage(code) + "</body></html>");
+            }
+        });
     }
 
     private void initWebApp() {
@@ -108,6 +126,7 @@ public class WebServer {
         servletHandler.setContextPath("/api");
         if (initRest) {
             ResourceConfig resourceConfig = new ResourceConfig();
+            resourceConfig.register(ResourceErrorHandler.class);
             resourceConfig.register(SecurityRequestFilter.class);
             resourceConfig.register(CorsResponseFilter.class);
             resourceConfig.registerClasses(ServerResource.class, SessionResource.class,