diff --git a/ChangeLog b/ChangeLog
index 5fe0a9d771..b926208296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-28  Michael Smith  <msmith@fluendo.com>
+
+	* gst/gstvalue.c: (gst_value_serialize_flags):
+	  Avoid NULL dereference when trying to serialize flags containing
+	  invalid values.
+
 2006-04-28  Michael Smith  <msmith@fluendo.com>
 
 	* plugins/elements/gsttypefindelement.c:
diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index aff241b9e6..0565c63043 100644
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -1928,9 +1928,10 @@ gst_value_serialize_flags (const GValue * value)
       g_free (result);
       result = tmp;
       first = FALSE;
+
+      /* clear flag */
+      flags &= ~fl->value;
     }
-    /* clear flag */
-    flags &= ~fl->value;
   }
   g_type_class_unref (klass);