diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
index a8094f3cb314a792f9fa9dfc56845523eb4d7089..ad39d4fda743704567b7dc23138f5f4e3cb15284 100644
--- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
+++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java
@@ -266,7 +266,8 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver {
                                     // ... and inject it.
                                     ((LeaseSet)dsm.getEntry()).setReceivedAsReply();
                                     if (_log.shouldLog(Log.INFO))
-                                        _log.info("Storing garlic LS down tunnel for: " + dsm.getKey() + " sent to: " + _client.toBase32());
+                                        _log.info("Storing garlic LS down tunnel for: " + dsm.getKey() + " sent to: " +
+                                                  (_client != null ? _client.toBase32() : "router"));
                                     _context.inNetMessagePool().add(dsm, null, null);
                             } else {                                        
                                 if (_client != null) {