diff --git a/ChangeLog b/ChangeLog
index 9f8e310337..e415f7f24b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-06  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/gstcaps.c: (gst_caps_append_structure):
+	  Move the poisoning to allow a NULL structure
+	* gst/gstevent.c: (_gst_event_free):
+	  When freeing a navigation event, free the structure
+	  also
+
 2004-01-04  David Schleef  <ds@schleef.org>
 
 	* gst/elements/gsttee.c: (gst_tee_init), (gst_tee_request_new_pad):
diff --git a/gst/gstcaps.c b/gst/gstcaps.c
index 8724ce1a50..0b9be9fad3 100644
--- a/gst/gstcaps.c
+++ b/gst/gstcaps.c
@@ -240,10 +240,10 @@ void gst_caps_append_structure (GstCaps *caps, GstStructure *structure)
 {
   g_return_if_fail(caps != NULL);
 
-#ifdef USE_POISONING
-  STRUCTURE_POISON (structure);
-#endif
   if (structure){
+#ifdef USE_POISONING
+    STRUCTURE_POISON (structure);
+#endif
     g_ptr_array_add (caps->structs, structure);
   }
 }
diff --git a/gst/gstevent.c b/gst/gstevent.c
index 56e8a15edf..22fb2b2b94 100644
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -93,6 +93,8 @@ _gst_event_free (GstEvent* event)
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_TAG:
       gst_tag_list_free (event->event_data.structure.structure);
+    case GST_EVENT_NAVIGATION:
+      gst_structure_free (event->event_data.structure.structure);
     default:
       break;
   }