diff --git a/ChangeLog b/ChangeLog
index 9c305ab148..3f31e4d737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-18  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* tests/check/elements/alsa.c: (test_device_property_probe):
+	  Fix test case: don't try to free NULL GValueArray when there
+	  are no devices.
+
 2006-05-18  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* tests/check/Makefile.am:
diff --git a/common b/common
index a5b66304e7..6811863fce 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a5b66304e7abe1440a0f8b0ed232ffbc56e8f3de
+Subproject commit 6811863fce665ce0a466bc03ee2ac5e2d5f47d28
diff --git a/tests/check/elements/alsa.c b/tests/check/elements/alsa.c
index 92ec86b3ac..1e93ae1dd3 100644
--- a/tests/check/elements/alsa.c
+++ b/tests/check/elements/alsa.c
@@ -46,17 +46,21 @@ GST_START_TEST (test_device_property_probe)
     fail_unless (probe != NULL);
 
     arr = gst_property_probe_probe_and_get_values_name (probe, "device");
+    if (arr) {
+      for (i = 0; i < arr->n_values; ++i) {
+        GValue *val;
 
-    for (i = 0; arr != NULL && i < arr->n_values; ++i) {
-      GValue *val;
+        val = g_value_array_get_nth (arr, i);
+        fail_unless (val != NULL);
+        fail_unless (G_VALUE_HOLDS_STRING (val));
 
-      val = g_value_array_get_nth (arr, i);
-      fail_unless (val != NULL);
-      fail_unless (G_VALUE_HOLDS_STRING (val));
-
-      GST_LOG_OBJECT (element, "device[%d] = %s", i, g_value_get_string (val));
+        GST_LOG_OBJECT (element, "device[%d] = %s", i,
+            g_value_get_string (val));
+      }
+      g_value_array_free (arr);
+    } else {
+      GST_LOG_OBJECT (element, "no devices found");
     }
-    g_value_array_free (arr);
 
     gst_object_unref (element);
   }