diff --git a/core/java/src/net/i2p/client/naming/DummyNamingService.java b/core/java/src/net/i2p/client/naming/DummyNamingService.java
index 2e009fe3fe..228276da84 100644
--- a/core/java/src/net/i2p/client/naming/DummyNamingService.java
+++ b/core/java/src/net/i2p/client/naming/DummyNamingService.java
@@ -58,7 +58,8 @@ class DummyNamingService extends NamingService {
         if (hostname.length() >= 516) {
             d = lookupBase64(hostname);
             // What the heck, cache these too
-            putCache(hostname, d);
+            if (d != null)
+                putCache(hostname, d);
             return d;
         }