diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c
index 76e66d544..0e7ae7c34 100644
--- a/lib/nvmf/vfio_user.c
+++ b/lib/nvmf/vfio_user.c
@@ -1737,7 +1737,7 @@ nvmf_vfio_user_accept(struct spdk_nvmf_transport *transport)
 		}
 
 		err = vfu_attach_ctx(endpoint->vfu_ctx);
-		if (err == -1) {
+		if (err != 0) {
 			if (errno == EAGAIN || errno == EWOULDBLOCK) {
 				continue;
 			}
@@ -2217,7 +2217,7 @@ nvmf_vfio_user_poll_group_poll(struct spdk_nvmf_transport_poll_group *group)
 			err = nvmf_vfio_user_ctrlr_poll(ctrlr);
 			if (spdk_unlikely(err) != 0) {
 				/* initiator shutdown or reset, waiting for another re-connect */
-				if (err == -ENOTCONN) {
+				if (errno == ENOTCONN) {
 					TAILQ_REMOVE(&vu_group->qps, vu_qpair, link);
 					ctrlr->ready = false;
 					continue;
diff --git a/libvfio-user b/libvfio-user
index 7e110c6b6..1194d5412 160000
--- a/libvfio-user
+++ b/libvfio-user
@@ -1 +1 @@
-Subproject commit 7e110c6b6452a2c7b6a0a64d1898e19d5f0b2831
+Subproject commit 1194d54124f0bb5b8b53bbd7700f1ac8574478ee