diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java
index 85cdb90d6e..b38d5f6a05 100644
--- a/core/java/src/net/i2p/data/RouterInfo.java
+++ b/core/java/src/net/i2p/data/RouterInfo.java
@@ -556,8 +556,8 @@ public class RouterInfo extends DatabaseEntry {
         _signature = new Signature();
         _signature.readBytes(in);
 
-        SHA1Hash hash = new SHA1Hash(digest.digest());
         if (verifySig) {
+            SHA1Hash hash = new SHA1Hash(digest.digest());
             _isValid = DSAEngine.getInstance().verifySignature(_signature, hash, _identity.getSigningPublicKey());
             _validated = true;
             if (!_isValid) {
diff --git a/history.txt b/history.txt
index c81caea5cc..34ab54521e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2012-03-28 zzz
+  * RouterInfo: Fix fatal NPE in last checkin
+
 2012-03-27 zzz
   * FloodfillVerify:
     - Fix verifies stuck on one peer by blamimg the verify peer on failure
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f0b07e778..b7509f1d34 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 = 24;
+    public final static long BUILD = 25;
 
     /** for example "-test" */
     public final static String EXTRA = "";