diff --git a/lib/nvme/nvme.c b/lib/nvme/nvme.c
index 6076a7cb2..ffb67293a 100644
--- a/lib/nvme/nvme.c
+++ b/lib/nvme/nvme.c
@@ -122,7 +122,11 @@ spdk_nvme_wait_for_completion_robust_lock(
 			nvme_robust_mutex_lock(robust_mutex);
 		}
 
-		spdk_nvme_qpair_process_completions(qpair, 0);
+		if (spdk_nvme_qpair_process_completions(qpair, 0) < 0) {
+			status->done = true;
+			status->cpl.status.sct = SPDK_NVME_SCT_GENERIC;
+			status->cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION;
+		}
 
 		if (robust_mutex) {
 			nvme_robust_mutex_unlock(robust_mutex);
diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c
index 3b828a7ad..1842e59af 100644
--- a/lib/nvme/nvme_tcp.c
+++ b/lib/nvme/nvme_tcp.c
@@ -1587,8 +1587,8 @@ nvme_tcp_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_c
 	do {
 		rc = nvme_tcp_read_pdu(tqpair, &reaped);
 		if (rc < 0) {
-			SPDK_ERRLOG("Error polling CQ! (%d): %s\n",
-				    errno, spdk_strerror(errno));
+			SPDK_DEBUGLOG(SPDK_LOG_NVME, "Error polling CQ! (%d): %s\n",
+				      errno, spdk_strerror(errno));
 			return -1;
 		} else if (rc == 0) {
 			/* Partial PDU is read */