diff --git a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
index 305d4d9f4..3483873a5 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
@@ -47,7 +47,8 @@ public class PeerManagerFacadeImpl implements PeerManagerFacade {
     public void shutdown() {
         _log.info("Shutting down the peer manager");
         _testJob.stopTesting();
-        _manager.storeProfiles();
+        if (_manager != null)
+            _manager.storeProfiles();
     }
     
     public void restart() {