diff --git a/lib/discovery.c b/lib/discovery.c
index 8301bea..2870bd6 100644
--- a/lib/discovery.c
+++ b/lib/discovery.c
@@ -118,15 +118,8 @@ iscsi_process_text_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
 			      pdu->private_data);
 		return -1;
 	}
-	if (size == 0) {
-		iscsi_set_error(iscsi, "size == 0 when parsing "
-				"discovery data");
-		pdu->callback(iscsi, SCSI_STATUS_ERROR, NULL,
-			      pdu->private_data);
-		return -1;
-	}
 
-	do {
+	while (size > 0) {
 		unsigned char *end;
 		int len;
 
@@ -204,7 +197,7 @@ iscsi_process_text_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
 
 		ptr  += len + 1;
 		size -= len + 1;
-	} while (size > 0);
+	}
 
 	pdu->callback(iscsi, SCSI_STATUS_GOOD, targets, pdu->private_data);
 	iscsi_free_discovery_addresses(iscsi, targets);
diff --git a/lib/login.c b/lib/login.c
index 9a7347f..c524108 100644
--- a/lib/login.c
+++ b/lib/login.c
@@ -982,21 +982,13 @@ iscsi_process_login_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
 		iscsi->expcmdsn = expcmdsn;
 	}
 
-	if (size == 0) {
-	       iscsi_set_error(iscsi, "size == 0 when parsing "
-			       "login data");
-	       pdu->callback(iscsi, SCSI_STATUS_ERROR, NULL,
-			     pdu->private_data);
-	       return -1;
-	}
-
 	/* XXX here we should parse the data returned in case the target
 	 * renegotiated some some parameters.
 	 *  we should also do proper handshaking if the target is not yet
 	 * prepared to transition to the next stage
 	 */
 
-	do {
+	while (size > 0) {
 		char *end;
 		int len;
 
@@ -1087,7 +1079,7 @@ iscsi_process_login_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
 
 		ptr  += len + 1;
 		size -= len + 1;
-	} while (size > 0);
+	}
 
 	if (status == SCSI_STATUS_REDIRECT && iscsi->target_address[0]) {
 		ISCSI_LOG(iscsi, 2, "target requests redirect to %s",iscsi->target_address);