diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index d9fa1a62cb8847bef3bb7b30a92bbd4bd7e01ab5..430e0298297bd8f00bf1ea2f97b638e8d873ebef 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -523,6 +523,10 @@ _error:
 	soup_message_set_status (message, SOUP_STATUS_INTERNAL_SERVER_ERROR);
 
 	if (NULL != cd) {
+		if (NULL != cd->stream) {
+			g_input_stream_close (cd->stream, NULL, NULL);
+		}
+
 		g_free (cd);
 	}
 
@@ -537,11 +541,7 @@ _error:
 	if (NULL != error) {
 		g_error_free (error);
 	}
-	
-	if (NULL != cd->stream) {
-		g_input_stream_close (cd->stream, NULL, NULL);
-	}
-	
+
 	if (NULL != stream) {
 		g_input_stream_close (stream, NULL, NULL);
 	}
diff --git a/libdmapsharing/dmap-gst-qt-input-stream.c b/libdmapsharing/dmap-gst-qt-input-stream.c
index 5be62157220218aebb19b8c8d1cc1261f3ac4705..b35ff60506b9fec8b3c3be17d44666c8135437a5 100644
--- a/libdmapsharing/dmap-gst-qt-input-stream.c
+++ b/libdmapsharing/dmap-gst-qt-input-stream.c
@@ -126,7 +126,7 @@ dmap_gst_qt_input_stream_new (GInputStream * src_stream)
 
 	gst_bin_add_many (GST_BIN (pipeline), src, decode, convert, audio_encode, mux, sink, NULL);
 
-	if (FALSE == gst_element_link (stream->priv->src, stream->priv->decode)) {
+	if (FALSE == gst_element_link (src, decode)) {
 		g_warning ("Error linking source and decode elements");
 		goto done;
 	}