diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c
index fb08729c1a..5a57c91ac7 100644
--- a/gst/gstpipeline.c
+++ b/gst/gstpipeline.c
@@ -104,6 +104,8 @@ gst_pipeline_init (GstPipeline *pipeline)
 
   /* get an instance of the default scheduler */
   scheduler = gst_scheduler_factory_make (NULL, GST_ELEMENT (pipeline));
+  /* FIXME need better error handling */
+  g_return_if_fail (scheduler != NULL);
 	  
   gst_scheduler_setup (scheduler);
 }