diff --git a/history.txt b/history.txt
index fc9352606f4822e161ab1fff0748cb9046d21fc1..d113e6feef856ac1078d77fb35031e5ce2781679 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.113 2004/12/19 06:04:57 jrandom Exp $
+$Id: history.txt,v 1.114 2004/12/19 11:27:10 jrandom Exp $
+
+2004-12-19  jrandom
+    * Fix for a race on startup wrt the new stats (thanks susi!)
 
 2004-12-19  jrandom
     * Added three new stats - router.activePeers, router.fastPeers, and 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 3ac7f8234b05b012188e46c6459907893ebc095a..2ca5bd25352387c80f55939998024c0854fdb2f6 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.118 $ $Date: 2004/12/19 06:04:57 $";
+    public final static String ID = "$Revision: 1.119 $ $Date: 2004/12/19 11:27:10 $";
     public final static String VERSION = "0.4.2.4";
-    public final static long BUILD = 3;
+    public final static long BUILD = 4;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index b328689c6181ced09b0585ba3f153e5d965d2f63..4b03fd4c23003ab8bb8b010381a96370fc68314c 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -51,7 +51,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
             _manager.restart();
     }
     
-    public int countActivePeers() { return _manager.countActivePeers(); }
+    public int countActivePeers() { return (_manager == null ? 0 : _manager.countActivePeers()); }
     
     public List getBids(OutNetMessage msg) {
         return _manager.getBids(msg);