diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
index 0aa2d1af2c6b96fab33e471cfb84b19ba3e986f4..eff898aae42bc5503e7848a40d67b32604951e36 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
@@ -127,6 +127,10 @@ public abstract class LocalHTTPServer {
         // Parameters are url, host, dest, nonce, and master | router | private.
         // Do the add and redirect.
         if (targetRequest.equals("/add")) {
+            if (query == null) {
+                out.write(ERR_ADD.getBytes("UTF-8"));
+                return;
+            }
             Map<String, String> opts = new HashMap<String, String>(8);
             // this only works if all keys are followed by =value
             StringTokenizer tok = new StringTokenizer(query, "=&;");
diff --git a/history.txt b/history.txt
index 75de889154c5a964d39c4c8da5a23b7617fe2906..a8280edcc8dfefd3560e36f55577672dc95c312b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,8 +1,26 @@
+2017-01-07 zzz
+ * i2ptunnel: Fix NPE on proxy.i2p/add when no params
+
+2017-01-06 zzz
+ * EepGet: Recognize more status codes
+
+2017-01-04 zzz
+ * Crypto: Enforce correct seed and hash lengths in EdDSAPrivateKeySpec
+ * Data: No longer sort addresses in an RI by SHA256
+ * Router: Replace random tunnel keys when rekeying
+
+2016-12-24 zzz
+ * Utils: Add RKG command line tool
+
+2016-12-23 zzz
+ * Console: Add Referrer-Policy header
+
 2016-12-22 zzz
  * Blocklist:
    - More efficiently check blocklist when receiving new RI
    - Check blocklist when loading RIs
    - Ensure blocklist is initialized before netdb
+ * Clock: Fix duplicate notification of clock shift listeners
  * Console: Limit age of news entries displayed
  * Update: Fix JVM crash and i2p.jar corruption when updating from -1
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 282c18b42238909e2faa8bba95d82c15667d116c..0725033fa600cfb5180ac82283f5194ee35b34b0 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 2;
+    public final static long BUILD = 3;
 
     /** for example "-test" */
     public final static String EXTRA = "";