diff --git a/lib/krb5/changepw.c b/lib/krb5/changepw.c
index cf4c631c0..d02484e98 100644
--- a/lib/krb5/changepw.c
+++ b/lib/krb5/changepw.c
@@ -678,8 +678,9 @@ change_password_loop (krb5_context	context,
 
 	    ret = connect(sock, a->ai_addr, a->ai_addrlen);
 	    if (rk_IS_SOCKET_ERROR(ret)) {
-		rk_closesocket (sock);
-		goto out;
+                ret = rk_SOCK_ERRNO;
+		rk_closesocket(sock);
+		continue;
 	    }
 
 	    /*