diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index 8554421cd01733a0165e9b63a0db57ed02316bfa..d7d5d70e95c1e9ee3c479d261f3736a31ccb773d 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -501,8 +501,16 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                         if(_log.shouldLog(Log.WARN)) {
                             _log.warn(getPrefix(requestId) + "Bad request [" + request + "]", use);
                         }
+                        // TODO fixup []| not escaped by browsers
                         try {
                             out.write(getErrorPage("baduri", ERR_BAD_URI).getBytes("UTF-8"));
+                            String msg = use.getLocalizedMessage();
+                            if (msg != null) {
+                                out.write(DataHelper.getASCII("<p>\n"));
+                                out.write(DataHelper.getUTF8(DataHelper.escapeHTML(msg)));
+                                out.write(DataHelper.getASCII("</p>\n"));
+                            }
+                            out.write(DataHelper.getASCII("</div>\n"));
                             writeFooter(out);
                             reader.drain();
                         } catch (IOException ioe) {
diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index 478d2f62f27d8b633a0582f04cbcde58456acbeb..8582956680a9dd9509fdcc896a36e66218d20fef 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -327,6 +327,9 @@ public class EepGet {
         try {
             nameURL = new URI(url);
         } catch (URISyntaxException e) {
+            String msg = e.getLocalizedMessage();
+            if (msg != null)
+                System.err.println(msg);
             System.err.println("Please enter a properly formed URL.");
             System.exit(1);
         }
diff --git a/installer/resources/proxy/baduri-header.ht b/installer/resources/proxy/baduri-header.ht
index 0f8e532210b4329d4fca332e72e94b9ce05dc2a5..0855dbdeb341c23c45c77b1e3bfed07c54ad6c0d 100644
--- a/installer/resources/proxy/baduri-header.ht
+++ b/installer/resources/proxy/baduri-header.ht
@@ -21,4 +21,3 @@ Proxy-Connection: close
 _("The request URI is invalid, and probably contains illegal characters.")
 _("If you clicked a link, check the end of the URI for any characters the browser has mistakenly added on.")
 </p>
-</div>