diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
index d9326fcd2..cbb1d1714 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -334,6 +334,7 @@ public class I2PSnarkUtil {
         return rv;
     }
     
+    /** @param ot non-null */
     public void setOpenTrackerString(String ot) { 
         _opts.put(PROP_OPENTRACKERS, ot);
     }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index f5d7918b8..7e199ed59 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -194,7 +194,9 @@ public class SnarkManager implements Snark.CompleteListener {
             _util.setProxy(eepHost, eepPort);
         _util.setMaxUploaders(getInt(PROP_UPLOADERS_TOTAL, Snark.MAX_TOTAL_UPLOADERS));
         _util.setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW));
-        _util.setOpenTrackerString(_config.getProperty(I2PSnarkUtil.PROP_OPENTRACKERS));
+        String ot = _config.getProperty(I2PSnarkUtil.PROP_OPENTRACKERS);
+        if (ot != null)
+            _util.setOpenTrackerString(ot);
         getDataDir().mkdirs();
     }
     
diff --git a/history.txt b/history.txt
index 97bf4a642..524b521ea 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2009-10-04 zzz
+    * i2psnark: Fix NPE caused by last checkin (thanks wuxia!)
+
 2009-10-02 zzz
     * BuildMessageTest: Move out of the lib
     * i2psnark: Fix changing opentracker list
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f4891fba6..b9e65a109 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 = 21;
+    public final static long BUILD = 22;
     /** for example "-test" */
     public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;