diff --git a/pipewire-pulseaudio/src/thread-mainloop.c b/pipewire-pulseaudio/src/thread-mainloop.c
index 8884b809c..70aeb8a26 100644
--- a/pipewire-pulseaudio/src/thread-mainloop.c
+++ b/pipewire-pulseaudio/src/thread-mainloop.c
@@ -60,6 +60,7 @@ pa_threaded_mainloop *pa_threaded_mainloop_new(void)
 SPA_EXPORT
 void pa_threaded_mainloop_free(pa_threaded_mainloop* m)
 {
+	spa_return_if_fail(m != NULL);
 	pw_thread_loop_destroy(m->tloop);
 	pa_mainloop_free(m->loop);
 	free(m);
@@ -68,64 +69,76 @@ void pa_threaded_mainloop_free(pa_threaded_mainloop* m)
 SPA_EXPORT
 int pa_threaded_mainloop_start(pa_threaded_mainloop *m)
 {
+	spa_return_val_if_fail(m != NULL, -EINVAL);
 	return pw_thread_loop_start(m->tloop);
 }
 
 SPA_EXPORT
 void pa_threaded_mainloop_stop(pa_threaded_mainloop *m)
 {
+	spa_return_if_fail(m != NULL);
 	pw_thread_loop_stop(m->tloop);
 }
 
 SPA_EXPORT
 void pa_threaded_mainloop_lock(pa_threaded_mainloop *m)
 {
+	spa_return_if_fail(m != NULL);
 	pw_thread_loop_lock(m->tloop);
 }
 
 SPA_EXPORT
 void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m)
 {
+	spa_return_if_fail(m != NULL);
 	pw_thread_loop_unlock(m->tloop);
 }
 
 SPA_EXPORT
 void pa_threaded_mainloop_wait(pa_threaded_mainloop *m)
 {
+	spa_return_if_fail(m != NULL);
 	pw_thread_loop_wait(m->tloop);
 }
 
 SPA_EXPORT
 void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_accept)
 {
+	spa_return_if_fail(m != NULL);
 	pw_thread_loop_signal(m->tloop, wait_for_accept);
 }
 
 SPA_EXPORT
 void pa_threaded_mainloop_accept(pa_threaded_mainloop *m)
 {
+	spa_return_if_fail(m != NULL);
 	pw_thread_loop_accept(m->tloop);
 }
 
 SPA_EXPORT
 int pa_threaded_mainloop_get_retval(PA_CONST pa_threaded_mainloop *m)
 {
+	spa_return_val_if_fail(m != NULL, -EINVAL);
 	return pa_mainloop_get_retval(m->loop);
 }
 
 SPA_EXPORT
 pa_mainloop_api* pa_threaded_mainloop_get_api(pa_threaded_mainloop*m)
 {
+	spa_return_val_if_fail(m != NULL, NULL);
 	return pa_mainloop_get_api(m->loop);
 }
 
 SPA_EXPORT
 int pa_threaded_mainloop_in_thread(pa_threaded_mainloop *m)
 {
+	spa_return_val_if_fail(m != NULL, -EINVAL);
 	return pw_thread_loop_in_thread(m->tloop);
 }
 
 SPA_EXPORT
 void pa_threaded_mainloop_set_name(pa_threaded_mainloop *m, const char *name)
 {
+	spa_return_if_fail(m != NULL);
+	spa_return_if_fail(name != NULL);
 }