diff --git a/ChangeLog b/ChangeLog
index 792b865206..16f0961f34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-04  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* tools/gst-launch.c: (main):
+	  Don't try to run erroneous pipelines.
+
 2005-10-04  Julien MOUTTE  <julien@moutte.net>
 
 	* gst/gstbus.c: We don't need this header.
diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index ce49e70672..2aa637770d 100644
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -571,8 +571,8 @@ main (int argc, char *argv[])
     return 1;
   } else if (error) {
     fprintf (stderr, _("WARNING: erroneous pipeline: %s\n"), error->message);
-    fprintf (stderr, _("         Trying to run anyway.\n"));
     g_error_free (error);
+    return 1;
   }
 
   if (verbose) {