diff --git a/src/kits/media/AddOnManager.cpp b/src/kits/media/AddOnManager.cpp
index 61abc71196..9be411ae34 100644
--- a/src/kits/media/AddOnManager.cpp
+++ b/src/kits/media/AddOnManager.cpp
@@ -216,7 +216,7 @@ AddOnManager::GetStreamers(entry_ref* outRefs, int32* outCount,
 			outRefs++;
 	}
 
-	return B_ERROR;
+	return B_OK;
 }
 
 
diff --git a/src/kits/media/MediaExtractor.cpp b/src/kits/media/MediaExtractor.cpp
index 4f381b90bf..e264977825 100644
--- a/src/kits/media/MediaExtractor.cpp
+++ b/src/kits/media/MediaExtractor.cpp
@@ -184,6 +184,12 @@ MediaExtractor::~MediaExtractor()
 
 	gPluginManager.DestroyReader(fReader);
 
+	// If this is a streaming situation we own
+	// the source
+	if (fStreamer != NULL) {
+		delete fSource;
+		gPluginManager.DestroyStreamer(fStreamer);
+	}
 	delete[] fStreamInfo;
 	// fSource is owned by the BMediaFile
 }