diff --git a/src/net/i2p/itoopie/i2pcontrol/JSONRPC2Interface.java b/src/net/i2p/itoopie/i2pcontrol/JSONRPC2Interface.java
index 62ebcfab6..257bb9755 100644
--- a/src/net/i2p/itoopie/i2pcontrol/JSONRPC2Interface.java
+++ b/src/net/i2p/itoopie/i2pcontrol/JSONRPC2Interface.java
@@ -90,7 +90,8 @@ public class JSONRPC2Interface {
 			throw new UnrecoverableFailedRequestException(); // Max retries reached. Throw exception.
 		}
 		HashMap outParams = (HashMap) req.getParams();
-		outParams.put("Token", token); // Add authentication token
+                if (token != null)
+		    outParams.put("Token", token); // Add authentication token
 		req.setParams(outParams);
 
 		JSONRPC2Response resp = null;