diff --git a/apps/jetty/java/src/net/i2p/servlet/I2PErrorHandler.java b/apps/jetty/java/src/net/i2p/servlet/I2PErrorHandler.java
new file mode 100644
index 000000000..8e6ec0824
--- /dev/null
+++ b/apps/jetty/java/src/net/i2p/servlet/I2PErrorHandler.java
@@ -0,0 +1,20 @@
+package net.i2p.servlet;
+
+import org.eclipse.jetty.ee8.nested.ErrorHandler;
+
+/**
+ *  Customize the error page.
+ *
+ *  @since Jetty 12
+ */
+public class I2PErrorHandler extends ErrorHandler
+{
+    public I2PErrorHandler() {
+        super();
+        setShowServlet(false);
+        setShowStacks(false);
+    }
+
+    // TODO Overrides
+
+}
diff --git a/installer/resources/eepsite/contexts/base-context.xml b/installer/resources/eepsite/contexts/base-context.xml
index 0cedc1db6..cdfa097ac 100644
--- a/installer/resources/eepsite/contexts/base-context.xml
+++ b/installer/resources/eepsite/contexts/base-context.xml
@@ -24,5 +24,10 @@ to serve static html files and images.
     <Arg>net.i2p.servlet.I2PDefaultServlet</Arg>
     <Arg>/</Arg>
   </Call>
+  <Call name="setErrorHandler">
+    <Arg>
+      <New class="net.i2p.servlet.I2PErrorHandler" />
+    </Arg>
+  </Call>
 </Configure>
 
diff --git a/installer/resources/eepsite/jetty.xml b/installer/resources/eepsite/jetty.xml
index 2ab0d3aad..222ffd3b0 100644
--- a/installer/resources/eepsite/jetty.xml
+++ b/installer/resources/eepsite/jetty.xml
@@ -155,7 +155,9 @@
     <!-- Set handler Collection Structure                            -->
     <!-- =========================================================== -->
     <Set name="defaultHandler">
-      <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
+      <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler">
+        <Set name="showContexts">false</Set>
+      </New>
     </Set>
     <Set name="handler">
       <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>