diff --git a/router/handshake.go b/router/handshake.go
index a86664c1..ccb638bb 100644
--- a/router/handshake.go
+++ b/router/handshake.go
@@ -102,7 +102,7 @@ func (conn *LocalConnection) handshake(enc *gob.Encoder, dec *gob.Decoder, accep
 		}
 	}
 	if existingConn, found := conn.local.ConnectionTo(name); found && existingConn.Established() {
-		return fmt.Errorf("Already have connection to %s at %s", name, existingConn.RemoteTCPAddr())
+		return fmt.Errorf("Already have connection to %s at %s", existingConn.Remote().FullName(), existingConn.RemoteTCPAddr())
 	}
 	uid, err := strconv.ParseUint(uidStr, 10, 64)
 	if err != nil {