diff --git a/libtransmission/net.c b/libtransmission/net.c
index 03a330181..c30ecaa4b 100644
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -477,11 +477,10 @@ tr_netOpenTCP( tr_session        * session,
     /* don't try to connect to multicast addresses */
     if( addr->type == TR_AF_INET && IN_MULTICAST( htonl( addr->addr.addr4.s_addr ) ) )
         return -EINVAL;
-    if( addr->type == TR_AF_INET6 && ( addr->addr.addr6.s6_addr[0] & 0xff ) )
+    if( addr->type == TR_AF_INET6 && ( addr->addr.addr6.s6_addr[0] == 0xff ) )
         return -EINVAL;
 
-    if( ( s = createSocket( ( addr->type == TR_AF_INET ? AF_INET : AF_INET6 ),
-                            type ) ) < 0 )
+    if( ( s = createSocket( ( addr->type == TR_AF_INET ? AF_INET : AF_INET6 ), type ) ) < 0 )
         return s;
 
     setSndBuf( session, s );
diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index 52c9d8af2..1d1d6cc95 100644
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -395,6 +395,7 @@ tr_peerIoNewOutgoing( tr_session        * session,
     assert( torrentHash );
 
     socket = tr_netOpenTCP( session, addr, port );
+    dbgmsg( NULL, "tr_netOpenTCP returned fd %d", socket );
 
     return socket < 0
            ? NULL
diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h
index e04c57db0..1441e40e6 100644
--- a/libtransmission/peer-io.h
+++ b/libtransmission/peer-io.h
@@ -159,7 +159,7 @@ const char* tr_peerIoAddrStr( const struct tr_address * addr,
 
 static TR_INLINE const char* tr_peerIoGetAddrStr( const tr_peerIo * io )
 {
-    return tr_peerIoAddrStr( &io->addr, io->port );
+    return tr_isPeerIo( io ) ? tr_peerIoAddrStr( &io->addr, io->port ) : "error";
 }
 
 const struct tr_address * tr_peerIoGetAddress( const tr_peerIo * io,