diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index 2f3872f369..a989e32fd7 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -62,6 +62,7 @@ public class EepGet {
     protected List<String> _extraHeaders;
 
     protected boolean _keepFetching;
+    // The proxy or the actual site if not proxied. Warning - null when extended by I2PSocketEepGet
     protected Socket _proxy;
     protected OutputStream _proxyOut;
     protected InputStream _proxyIn;
@@ -678,7 +679,8 @@ public class EepGet {
             else
                 timeout.setInactivityTimeout(INACTIVITY_TIMEOUT);
         }
-        if (!_shouldProxy) {
+        // _proxy is null when extended by I2PSocketEepGet
+        if (_proxy != null && !_shouldProxy) {
             // we only set the soTimeout before the headers if not proxied
             if (_fetchInactivityTimeout > 0)
                 _proxy.setSoTimeout(_fetchInactivityTimeout);
@@ -914,10 +916,12 @@ public class EepGet {
                 return; 
             case 400: // bad req
             case 401: // server auth
+            case 402: // payment required
             case 403: // bad req
             case 404: // not found
             case 408: // req timeout
             case 409: // bad addr helper
+            case 410: // gone
             case 414: // URI too long
             case 429: // too many requests
             case 431: // headers too long
diff --git a/history.txt b/history.txt
index a5d09d49a2..3afb4766c9 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2015-04-22 zzz
+ * i2psnark: Fix deletion of config files, cleanup old ones (ticket #1498)
+ * I2PSocketEepGet: Fix i2psnark NPE caused by -6 (ticket #1543)
+ * NTCP: Reduce min send finisher threads to 1
+ * PortMapper: Status output for /debug
+
 2015-04-21 zzz
  * i2ptunnel: Log uncaught errors in thread pool
  * Reseed: Disable non-su3 reseeding
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index c10128fe62..fecba78d69 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 = 6;
+    public final static long BUILD = 7;
 
     /** for example "-test" */
     public final static String EXTRA = "";