diff --git a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
index 892475ab77c3437e83e45cd274d291c02e58c6d1..a1289c43e388426a308443ef4c56f62097fb4c1c 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
@@ -550,12 +550,13 @@ public class DatabaseLookupMessage extends FastI2NPMessageImpl {
             buf.append(_key.toBase32());
         else
             buf.append(_key);
-        if (_replyKey != null)
+        if (_replyTunnel != null)
             buf.append("\n\tReply GW: ");
         else
             buf.append("\n\tFrom: ");
-        buf.append(_fromHash);
-        buf.append("\n\tReply Tunnel: ").append(_replyTunnel);
+        buf.append(_fromHash.toBase64());
+        if (_replyTunnel != null)
+            buf.append("\n\tReply Tunnel: ").append(_replyTunnel);
         if (_replyKey != null)
             buf.append("\n\tReply Key: ").append(_replyKey);
         if (_replyTag != null)