diff --git a/ChangeLog b/ChangeLog
index 78f448305c..86dd9e46be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-09  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* sys/ximage/ximagesink.c: (gst_ximagesink_navigation_send_event):
+	* sys/xvimage/xvimagesink.c:
+	(gst_xvimagesink_navigation_send_event):
+	  Check for pad availability before sending event.
+
 2005-01-08  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst-plugins.spec.in:
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index d73d26af4a..72e39002e7 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -1247,6 +1247,9 @@ gst_ximagesink_navigation_send_event (GstNavigation * navigation,
   gint x_offset, y_offset;
   double x, y;
 
+  if (!GST_PAD_PEER (GST_VIDEOSINK_PAD (ximagesink)))
+    return;
+
   event = gst_event_new (GST_EVENT_NAVIGATION);
   event->event_data.structure.structure = structure;
 
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 10aede9934..5bdcd18f2f 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1553,6 +1553,9 @@ gst_xvimagesink_navigation_send_event (GstNavigation * navigation,
   GstEvent *event;
   double x, y;
 
+  if (!GST_PAD_PEER (GST_VIDEOSINK_PAD (xvimagesink)))
+    return;
+
   event = gst_event_new (GST_EVENT_NAVIGATION);
   event->event_data.structure.structure = structure;