diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c
index 4e3ba5cd0..d7f570772 100644
--- a/src/pipewire/filter.c
+++ b/src/pipewire/filter.c
@@ -999,8 +999,8 @@ pw_filter_new_simple(struct pw_loop *loop,
 		return NULL;
 
 	context = pw_context_new(loop, NULL, 0);
-
-	pw_fill_connect_properties(context, props);
+	if (context == NULL)
+		return NULL;
 
 	impl = filter_new(context, name, props, props);
 	if (impl == NULL) {
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index acffe8140..0c8ea3051 100644
--- a/src/pipewire/stream.c
+++ b/src/pipewire/stream.c
@@ -1120,8 +1120,8 @@ pw_stream_new_simple(struct pw_loop *loop,
 		return NULL;
 
 	context = pw_context_new(loop, NULL, 0);
-
-	pw_fill_connect_properties(context, props);
+	if (context == NULL)
+		return NULL;
 
 	impl = stream_new(context, name, props, NULL);
 	if (impl == NULL) {