diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c
index b517ee70..86830c07 100644
--- a/remoting/remoting-plugin.c
+++ b/remoting/remoting-plugin.c
@@ -211,10 +211,12 @@ remoting_gst_pipeline_init(struct remoted_output *output)
 	weston_log("GST pipeline: %s\n", output->gst_pipeline);
 
 	output->pipeline = gst_parse_launch(output->gst_pipeline, &err);
-	if (!output->pipeline) {
+	if (!output->pipeline || err) {
 		weston_log("Could not create gstreamer pipeline. Error: %s\n",
 			   err->message);
 		g_error_free(err);
+		if (output->pipeline)
+			goto err;
 		return -1;
 	}