diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java
index 2cde0fd19d677988e69f9b2c5c73d5093eb84548..d6c82a6d867a638473951da0f77f0f651d2bb2d6 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerState.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java
@@ -443,10 +443,7 @@ public class PeerState {
     }
 
     /**
-     * The peer are we talking to.  This should be set as soon as this
-     * state is created if we are initiating a connection, but if we are
-     * receiving the connection this will be set only after the connection
-     * is established.
+     * The peer are we talking to. Non-null.
      */
     public Hash getRemotePeer() { return _remotePeer; }
     /**
@@ -2372,8 +2369,7 @@ public class PeerState {
     public String toString() {
         StringBuilder buf = new StringBuilder(256);
         buf.append(_remoteHostId.toString());
-        if (_remotePeer != null)
-            buf.append(" ").append(_remotePeer.toBase64().substring(0,6));
+        buf.append(' ').append(_remotePeer.toBase64().substring(0,6));
 
         if (getVersion() == 2)
             buf.append(_isInbound? " IB2 " : " OB2 ");