diff --git a/build.xml b/build.xml
index 7a25dc51..5f735092 100644
--- a/build.xml
+++ b/build.xml
@@ -101,7 +101,7 @@
     <else> 
       <exec executable="./${aTest}" failonerror="true" dir="${output.folder}/test" > 
         <arg value="--connection" />
-        <arg value="tcp://${test.hostname}:${test.port}" />
+        <arg value="tcp://${test.hostname}:1883" />
         <env key="LD_LIBRARY_PATH" path="${output.folder}" />
         <env key="DYLD_LIBRARY_PATH" path="${output.folder}" />
         <arg value="--verbose" />
diff --git a/src/MQTTAsync.c b/src/MQTTAsync.c
index 57eaf447..c464acd8 100644
--- a/src/MQTTAsync.c
+++ b/src/MQTTAsync.c
@@ -1487,8 +1487,7 @@ thread_return_type WINAPI MQTTAsync_receiveThread(void* n)
 		}
 		if (rc == SOCKET_ERROR)
 		{
-			Log(TRACE_MINIMUM, -1, "Error from MQTTAsync_cycle() - not removing socket %d", sock);
-#if 0
+			Log(TRACE_MINIMUM, -1, "Error from MQTTAsync_cycle() - removing socket %d", sock);
 			if (m->c->connected == 1)
 			{
 				MQTTAsync_unlock_mutex(mqttasync_mutex);
@@ -1497,7 +1496,6 @@ thread_return_type WINAPI MQTTAsync_receiveThread(void* n)
 			}
 			else /* calling disconnect_internal won't have any effect if we're already disconnected */
 				MQTTAsync_closeOnly(m->c);
-#endif
 		}
 		else
 		{