diff --git a/limelight-common/AudioStream.c b/limelight-common/AudioStream.c
index b1d9ed3..1ef3ae0 100644
--- a/limelight-common/AudioStream.c
+++ b/limelight-common/AudioStream.c
@@ -54,7 +54,7 @@ static void UdpPingThreadProc(void *context) {
 		err = sendto(rtpSocket, pingData, sizeof(pingData), 0, (struct sockaddr*)&saddr, sizeof(saddr));
 		if (err != sizeof(pingData)) {
 			Limelog("UDP ping thread terminating #1\n");
-			listenerCallbacks->connectionTerminated(err);
+			listenerCallbacks->connectionTerminated(LastSocketError());
 			return;
 		}
 
@@ -77,7 +77,7 @@ static void ReceiveThreadProc(void* context) {
 		if (err <= 0) {
 			Limelog("Receive thread terminating #2\n");
 			free(buffer);
-			listenerCallbacks->connectionTerminated(err);
+			listenerCallbacks->connectionTerminated(LastSocketError());
 			return;
 		}
 
diff --git a/limelight-common/VideoStream.c b/limelight-common/VideoStream.c
index e181560..ba68419 100644
--- a/limelight-common/VideoStream.c
+++ b/limelight-common/VideoStream.c
@@ -66,7 +66,7 @@ static void UdpPingThreadProc(void *context) {
 		err = sendto(rtpSocket, pingData, sizeof(pingData), 0, (struct sockaddr*)&saddr, sizeof(saddr));
 		if (err != sizeof(pingData)) {
 			Limelog("UDP ping thread terminating #1\n");
-			listenerCallbacks->connectionTerminated(err);
+			listenerCallbacks->connectionTerminated(LastSocketError());
 			return;
 		}
 
@@ -89,7 +89,7 @@ static void ReceiveThreadProc(void* context) {
 		if (err <= 0) {
 			Limelog("Receive thread terminating #2\n");
 			free(buffer);
-			listenerCallbacks->connectionTerminated(err);
+			listenerCallbacks->connectionTerminated(LastSocketError());
 			return;
 		}