diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java
index 1bb7cd37d9..069691e4ba 100644
--- a/router/java/src/net/i2p/router/MessageHistory.java
+++ b/router/java/src/net/i2p/router/MessageHistory.java
@@ -81,6 +81,8 @@ public class MessageHistory {
     public void initialize(boolean forceReinitialize) {
         if (!forceReinitialize) return;
 
+        if (_context.router() == null) return;
+        
         if (_context.router().getRouterInfo() == null) {
             _reinitializeJob.getTiming().setStartAfter(_context.clock().now()+5000);
             _context.jobQueue().addJob(_reinitializeJob);