diff --git a/lib/log/log_flags.c b/lib/log/log_flags.c
index 8d9983a9e..25c2d8d8c 100644
--- a/lib/log/log_flags.c
+++ b/lib/log/log_flags.c
@@ -87,12 +87,14 @@ spdk_log_register_trace_flag(const char *name, struct spdk_trace_flag *flag)
 
 	if (name == NULL || flag == NULL) {
 		SPDK_ERRLOG("missing spdk_trace_flag parameters\n");
-		abort();
+		assert(false);
+		return;
 	}
 
 	if (get_trace_flag(name)) {
 		SPDK_ERRLOG("duplicate spdk_trace_flag '%s'\n", name);
-		abort();
+		assert(false);
+		return;
 	}
 
 	TAILQ_FOREACH(iter, &g_trace_flags, tailq) {
diff --git a/lib/thread/thread.c b/lib/thread/thread.c
index c79e4c534..5c1167465 100644
--- a/lib/thread/thread.c
+++ b/lib/thread/thread.c
@@ -223,18 +223,21 @@ spdk_poller_register(spdk_poller_fn fn,
 
 	thread = spdk_get_thread();
 	if (!thread) {
-		abort();
+		assert(false);
+		return NULL;
 	}
 
 	if (!thread->start_poller_fn || !thread->stop_poller_fn) {
 		SPDK_ERRLOG("No related functions to start requested poller\n");
-		abort();
+		assert(false);
+		return NULL;
 	}
 
 	poller = thread->start_poller_fn(thread->thread_ctx, fn, arg, period_microseconds);
 	if (!poller) {
 		SPDK_ERRLOG("Unable to start requested poller\n");
-		abort();
+		assert(false);
+		return NULL;
 	}
 
 	return poller;