diff --git a/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java b/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
index ec24848063b8d22c4b6fb11800195e1e86c51c2a..968beb4928e327d093beaf1c807bfdb45bcb4c79 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/LanTcpPlugin.java
@@ -153,7 +153,6 @@ class LanTcpPlugin extends TcpPlugin {
 						try {
 							// Connect back on the advertised TCP port
 							Socket s = new Socket(packet.getAddress(), port);
-							s.setSoTimeout(0);
 							return new TcpTransportConnection(s, maxLatency);
 						} catch(IOException e) {
 							if(LOG.isLoggable(WARNING))
@@ -291,7 +290,6 @@ class LanTcpPlugin extends TcpPlugin {
 					int wait = (int) (Math.min(end, nextPacket) - now);
 					ss.setSoTimeout(wait < 1 ? 1 : wait);
 					Socket s = ss.accept();
-					s.setSoTimeout(0);
 					return new TcpTransportConnection(s, maxLatency);
 				} catch(SocketTimeoutException e) {
 					now = clock.currentTimeMillis();
diff --git a/briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java b/briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java
index 0c6c3b7890f61ab2b32bbf105a299d500d524ee8..05aeaf33189dce123398ce435de31f5d92ca16d7 100644
--- a/briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/tcp/TcpPlugin.java
@@ -78,6 +78,7 @@ abstract class TcpPlugin implements DuplexPlugin {
 				found = true;
 				break;
 			} catch(IOException e) {
+				if(LOG.isLoggable(INFO)) LOG.info("Failed to bind " + addr);
 				if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				tryToClose(ss);
 				continue;
@@ -128,7 +129,6 @@ abstract class TcpPlugin implements DuplexPlugin {
 			Socket s;
 			try {
 				s = ss.accept();
-				s.setSoTimeout(0);
 			} catch(IOException e) {
 				// This is expected when the socket is closed
 				if(LOG.isLoggable(INFO)) LOG.log(INFO, e.toString(), e);
@@ -179,7 +179,6 @@ abstract class TcpPlugin implements DuplexPlugin {
 		if(addr == null) return null;
 		Socket s = new Socket();
 		try {
-			s.setSoTimeout(0);
 			s.connect(addr);
 			return new TcpTransportConnection(s, maxLatency);
 		} catch(IOException e) {