diff --git a/lib/socket.c b/lib/socket.c
index 4aa0d9a..f1fca1b 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -601,11 +601,15 @@ iscsi_read_from_socket(struct iscsi_context *iscsi)
 	do {
 		if (iscsi->incoming == NULL) {
 			iscsi->incoming = iscsi_szmalloc(iscsi, sizeof(struct iscsi_in_pdu));
-			iscsi->incoming->hdr = iscsi_smalloc(iscsi, ISCSI_HEADER_SIZE);
 			if (iscsi->incoming == NULL) {
 				iscsi_set_error(iscsi, "Out-of-memory: failed to malloc iscsi_in_pdu");
 				return -1;
 			}
+			iscsi->incoming->hdr = iscsi_smalloc(iscsi, ISCSI_HEADER_SIZE);
+			if (iscsi->incoming->hdr == NULL) {
+				iscsi_set_error(iscsi, "Out-of-memory");
+				return -1;
+			}
 		}
 		in = iscsi->incoming;