diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
index 640992e431..bdc67ce9d1 100644
--- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
@@ -1190,8 +1190,8 @@ public FloodfillNetworkDatabaseFacade getFloodfillNetworkDatabaseFacade() {
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("getFloodfillNetworkDatabaseFacade is getting the subDb for dbid: " + this.getDestHash());
         if (_floodfillNetworkDatabaseFacade == null) {
-            if (_log.shouldLog(Log.ERROR))
-                _log.error("getFloodfillNetworkDatabaseFacade is null for runner", new Exception());
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("getFloodfillNetworkDatabaseFacade is null for runner");
             return _context.netDb();
         }
         return this._floodfillNetworkDatabaseFacade;
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index fa3c30b08d..a0bd6d16cc 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -785,6 +785,11 @@ public FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Ha
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Getting subDb for desthash: " + destHash);
             ClientConnectionRunner runner = getRunner(destHash);
+            if (runner == null){
+                if (_log.shouldLog(Log.WARN))
+                _log.warn("ClientManager got a null runner in getClientFloodfillNetworkDatabaseFacade for " + destHash);
+                return null;
+            }
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("ClientManager got a runner in getClientFloodfillNetworkDatabaseFacade for " + destHash);
             return runner.getFloodfillNetworkDatabaseFacade();
@@ -800,8 +805,11 @@ public FloodfillNetworkDatabaseFacade getClientFloodfillNetworkDatabaseFacade(Ha
     public Set<FloodfillNetworkDatabaseFacade> getClientFloodfillNetworkDatabaseFacades() {
         Set<FloodfillNetworkDatabaseFacade> rv = new HashSet<FloodfillNetworkDatabaseFacade>();
         for (ClientConnectionRunner runner : _runners.values()) {
-            if (runner != null)
-                rv.add(runner.getFloodfillNetworkDatabaseFacade());
+            if (runner != null){
+                FloodfillNetworkDatabaseFacade fndf = runner.getFloodfillNetworkDatabaseFacade();
+                if (fndf != null)
+                    rv.add(fndf);
+            }
         }
         return rv;
     }