diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
index 9ddf763a7e..30a2a81b06 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
@@ -356,7 +356,9 @@ public void timeReached() {
                     } else {
                         // received from both Bob and Charlie, but we haven't received a
                         // second message from Charlie yet
-                        sendTestToCharlie();
+                        if (state.getCharliePort() != PENDING_PORT)
+                            sendTestToCharlie();
+                        // else msg 5 wasn't from a valid ip/port ???
                     }
                     if (bobTime > 0 && charlieTime <= 0) {
                         if (state.getBeginTime() + MAX_CHARLIE_LIFETIME < now) {