diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 623474465..7dd4f3d2a 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -367,8 +367,7 @@ nvmf_tgt_destroy_cb(void *io_device)
 						 * is destroyed, nvmf_tgt_destroy_cb will continue to destroy other subsystems if any */
 						return;
 					} else {
-						SPDK_ERRLOG("Failed to destroy subsystem, id %u, rc %d\n", tgt->subsystems[i]->id, rc);
-						assert(0);
+						SPDK_ERRLOG("Failed to destroy subsystem %s, rc %d\n", tgt->subsystems[i]->subnqn, rc);
 					}
 				}
 			}
diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c
index c0a537a10..c4fa1461c 100644
--- a/lib/nvmf/subsystem.c
+++ b/lib/nvmf/subsystem.c
@@ -420,8 +420,8 @@ spdk_nvmf_subsystem_destroy(struct spdk_nvmf_subsystem *subsystem, nvmf_subsyste
 	assert(spdk_get_thread() == subsystem->thread);
 
 	if (subsystem->state != SPDK_NVMF_SUBSYSTEM_INACTIVE) {
-		SPDK_ERRLOG("Subsystem can only be destroyed in inactive state, current state %d\n",
-			    subsystem->state);
+		SPDK_ERRLOG("Subsystem can only be destroyed in inactive state, %s state %d\n",
+			    subsystem->subnqn, subsystem->state);
 		return -EAGAIN;
 	}
 	if (subsystem->destroying) {
diff --git a/module/event/subsystems/nvmf/nvmf_tgt.c b/module/event/subsystems/nvmf/nvmf_tgt.c
index d65c1619b..b8bb0f3b2 100644
--- a/module/event/subsystems/nvmf/nvmf_tgt.c
+++ b/module/event/subsystems/nvmf/nvmf_tgt.c
@@ -260,7 +260,8 @@ _nvmf_tgt_subsystem_destroy(void *cb_arg)
 				 * is destroyed, _nvmf_tgt_subsystem_destroy will continue to destroy other subsystems if any */
 				return;
 			} else {
-				SPDK_ERRLOG("Unable to destroy NVMe-oF subsystem, rc %d. Trying others.\n", rc);
+				SPDK_ERRLOG("Unable to destroy subsystem %s, rc %d. Trying others.\n",
+					    spdk_nvmf_subsystem_get_nqn(subsystem), rc);
 			}
 		}
 		subsystem = next_subsystem;