diff --git a/sys/oss4/oss4-property-probe.c b/sys/oss4/oss4-property-probe.c
index 2e164f2853..51ff3c1ca9 100644
--- a/sys/oss4/oss4-property-probe.c
+++ b/sys/oss4/oss4-property-probe.c
@@ -315,7 +315,8 @@ gst_oss4_property_probe_get_values (GstObject * probe, const gchar * pname)
     fd = GST_OSS4_SOURCE (probe)->fd;
   } else {
     GST_OBJECT_UNLOCK (obj);
-    g_return_val_if_reached (NULL);
+    g_assert_not_reached ();
+    return NULL;
   }
 
   /* copy fd if it's open, so we can just unconditionally close() later */
@@ -342,6 +343,7 @@ gst_oss4_property_probe_get_values (GstObject * probe, const gchar * pname)
   }
 
   if (devices == NULL) {
+    GST_OBJECT_UNLOCK (obj);
     GST_DEBUG_OBJECT (obj, "No devices found");
     goto done;
   }