diff --git a/gst/gst.c b/gst/gst.c
index d61bdfe9c4..edac075e82 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -70,7 +70,9 @@ debug_log_handler (const gchar *log_domain,
 		   gpointer user_data)
 {
   g_log_default_handler (log_domain, log_level, message, user_data);
-  g_on_error_query (NULL);
+  /* FIXME: do we still need this ? fatal errors these days are all
+   * other than core errors */
+  /* g_on_error_query (NULL); */
 }
 
 enum {
diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c
index 962e32bfe1..8da8d6abcc 100644
--- a/gst/gstpipeline.c
+++ b/gst/gstpipeline.c
@@ -108,9 +108,11 @@ gst_pipeline_init (GstPipeline *pipeline)
 
   /* FIXME need better error handling */
   if (scheduler == NULL) {
-    g_error ("Critical error: could not get a scheduler - \
-	      are you sure you have a registry ? Run gst-register as root \
-	      if you haven't done so yet.");
+    const gchar *name = gst_scheduler_factory_get_default_name ();
+
+    g_error ("Critical error: could not get scheduler \"%s\"\n"
+	     "Are you sure you have a registry ?\n"
+	     "Run gst-register as root if you haven't done so yet.", name);
   }
 }