diff --git a/history.txt b/history.txt
index 3cee76c48..bbdeb990b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2011-02-10 sponge
+    * I2CP: fix NPE in QueuedClientConnectionRunner
+
 2011-02-10 zzz
     * I2CP: Correctly close internal connections on the router side
             when closed by the client, was causing massive memory leak
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index c10128fe6..fecba78d6 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 = "";
diff --git a/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java b/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java
index 61c37c1f5..aac9b68e0 100644
--- a/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java
+++ b/router/java/src/net/i2p/router/client/QueuedClientConnectionRunner.java
@@ -17,7 +17,7 @@ import net.i2p.util.Log;
  * @since 0.8.3
  */
 class QueuedClientConnectionRunner extends ClientConnectionRunner {
-    private /* final */ I2CPMessageQueue queue;
+    private final I2CPMessageQueue queue;
     
     /**
      * Create a new runner with the given queues
@@ -46,7 +46,7 @@ class QueuedClientConnectionRunner extends ClientConnectionRunner {
     void stopRunning() {
         super.stopRunning();
         queue.close();
-        queue = null;
+        // queue = null;
     }
     
     /**