1 files changed, 5 insertions, 0 deletions
diff --git a/src/htbt.c b/src/htbt.c
index 42e7573..87cc852 100644
--- a/src/htbt.c
+++ b/src/htbt.c
@@ -1419,6 +1419,10 @@ static bool htbt_slv_consume_inbuf (
 			htbt_slv_raise_protoerr(ctx, f_head.id, PRNE_HTBT_STATUS_UNIMPL);
 			goto END;
 		}
+
+		if (!ret) {
+			break;
+		}
 	}
 
 END:
@@ -1656,6 +1660,7 @@ ERR:
 		if (getsockopt(pfd[i].fd, SOL_SOCKET, SO_ERROR, &f_ret, &sl) != 0 ||
 			f_ret != 0)
 		{
+			errno = f_ret;
 			continue;
 		}