diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c
index 9c0ed54d7..c0a537a10 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\n");
-		assert(0);
+		SPDK_ERRLOG("Subsystem can only be destroyed in inactive state, current state %d\n",
+			    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 8630864cc..d65c1619b 100644
--- a/module/event/subsystems/nvmf/nvmf_tgt.c
+++ b/module/event/subsystems/nvmf/nvmf_tgt.c
@@ -232,7 +232,8 @@ nvmf_tgt_subsystem_stopped(struct spdk_nvmf_subsystem *subsystem,
 	if (subsystem) {
 		rc = spdk_nvmf_subsystem_stop(subsystem, nvmf_tgt_subsystem_stopped, NULL);
 		if (rc) {
-			SPDK_ERRLOG("Unable to stop NVMe-oF subsystem. Trying others.\n");
+			SPDK_ERRLOG("Unable to stop NVMe-oF subsystem %s with rc %d, Trying others.\n",
+				    spdk_nvmf_subsystem_get_nqn(subsystem), rc);
 			nvmf_tgt_subsystem_stopped(subsystem, NULL, 0);
 		}
 		return;