diff --git a/src/cc/cc-http-server.c b/src/cc/cc-http-server.c
index ecac4ba958fd0f7a10fb28a26e9ab9e83fc55f21..ae42547869a01c78eaaa00939f969a5a71c2c9d1 100644
--- a/src/cc/cc-http-server.c
+++ b/src/cc/cc-http-server.c
@@ -117,6 +117,7 @@ gst_bus_message_cb (GstBus *bus, GstMessage *msg, CcHttpServer *self)
             g_signal_emit_by_name (self->multisocketsink, "clear");
             cc_http_server_set_pipeline_state (self, GST_STATE_NULL);
             g_signal_emit_by_name (self, "end-stream", error_);
+            g_clear_error (&error_);
           }
 
         g_clear_error (&error);
@@ -400,6 +401,7 @@ cc_http_server_set_pipeline_state (CcHttpServer *self, GstState state)
                                     gst_element_state_get_name (state));
       g_warning ("CcHttpServer: %s", error_->message);
       g_signal_emit_by_name (self, "end-stream", error_);
+      g_clear_error(&error_);
     }
 }
 
@@ -530,7 +532,7 @@ cc_http_server_class_init (CcHttpServerClass *klass)
                   0,
                   NULL, NULL, NULL,
                   G_TYPE_NONE,
-                  1, G_TYPE_POINTER);
+                  1, G_TYPE_ERROR);
 }
 
 void
diff --git a/src/nd-cc-sink.c b/src/nd-cc-sink.c
index aa45ced47db7949433743aac1467be04d582e176..e3230fdcd71d299a13d84b0694e40e57ac30ef14 100644
--- a/src/nd-cc-sink.c
+++ b/src/nd-cc-sink.c
@@ -208,7 +208,6 @@ static void
 end_stream_callback (gpointer userdata, GError *error)
 {
   g_debug ("NdCCSink: Error received: %s", error->message);
-  g_clear_error (&error);
 
   nd_cc_sink_sink_stop_stream (ND_SINK (userdata));
 }
diff --git a/src/nd-dummy-cc-sink.c b/src/nd-dummy-cc-sink.c
index 672bf5d6df8436b96ce8acb7085d6bff96c4bf76..9f9473196303d916020c5f64af385c5e0d053cb5 100644
--- a/src/nd-dummy-cc-sink.c
+++ b/src/nd-dummy-cc-sink.c
@@ -173,7 +173,6 @@ static void
 end_stream_callback (gpointer userdata, GError *error)
 {
   g_debug ("NdDummyCCSink: Error received: %s", error->message);
-  g_clear_error (&error);
 
   nd_dummy_cc_sink_sink_stop_stream (ND_SINK (userdata));
 }
@@ -210,8 +209,8 @@ start_server (NdDummyCCSink *self)
       g_object_notify (G_OBJECT (self), "state");
     }
 
-  g_debug ("NdDummyCCSink: You should now be able to connect to http://localhost:%d/",
-           cc_http_server_get_port (self->http_server));
+  g_message ("NdDummyCCSink: You should now be able to connect to http://localhost:%d/",
+             cc_http_server_get_port (self->http_server));
 
   return G_SOURCE_REMOVE;
 }
diff --git a/src/nd-dummy-wfd-sink.c b/src/nd-dummy-wfd-sink.c
index e5c5ad80ed01ccf5bdb40722aa30358808653359..48cdcfa47abc8be213419ad791e70d88974a4769 100644
--- a/src/nd-dummy-wfd-sink.c
+++ b/src/nd-dummy-wfd-sink.c
@@ -248,7 +248,7 @@ nd_dummy_wfd_sink_sink_start_stream (NdSink *sink)
   if (self->server_source_id == 0)
     goto error;
 
-  g_debug ("NdDummyWFDSink: You should now be able to connect to rtsp://localhost:7236/wfd1.0");
+  g_message ("NdDummyWFDSink: You should now be able to connect to rtsp://localhost:7236/wfd1.0");
 
   g_signal_connect_object (self->server,
                            "client-connected",