@@ -214,10 +214,15 @@
 
 	dprintf("Calling Tls_WaitForConnect");
 	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
 	if (tlsConnect < 0) {
 		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);
+
+		if (statePtr->flags & TLS_TCL_HANDSHAKE_FAILED) {
+			dprintf("The handshake completely failed, returning in failure");
+			return(-1);
+		}
 
 		bytesRead = -1;
 		if (*errorCodePtr == ECONNRESET) {
 			dprintf("Got connection reset");
 			/* Soft EOF */
@@ -338,10 +343,15 @@
 
 	dprintf("Calling Tls_WaitForConnect");
 	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
 	if (tlsConnect < 0) {
 		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);
+
+		if (statePtr->flags & TLS_TCL_HANDSHAKE_FAILED) {
+			dprintf("The handshake completely failed, returning in failure");
+			return(-1);
+		}
 
 		written = -1;
 		if (*errorCodePtr == ECONNRESET) {
 			dprintf("Got connection reset");
 			/* Soft EOF */