diff --git a/src/kits/media/AddOnManager.cpp b/src/kits/media/AddOnManager.cpp
index 3dde8ac31a..8244de46bc 100644
--- a/src/kits/media/AddOnManager.cpp
+++ b/src/kits/media/AddOnManager.cpp
@@ -15,6 +15,7 @@
 #include <string.h>
 
 #include <Architecture.h>
+#include <AutoDeleter.h>
 #include <Autolock.h>
 #include <Directory.h>
 #include <Entry.h>
@@ -112,6 +113,8 @@ AddOnManager::GetDecoderForFormat(entry_ref* _decoderRef,
 		return B_ENTRY_NOT_FOUND;
 	}
 
+	MemoryDeleter directoriesDeleter(directories);
+
 	BPath path;
 	for (uint i = 0; i < directoryCount; i++) {
 		path.SetTo(directories[i]);
@@ -144,6 +147,8 @@ AddOnManager::GetReaders(entry_ref* outRefs, int32* outCount,
 		return B_ENTRY_NOT_FOUND;
 	}
 
+	MemoryDeleter directoriesDeleter(directories);
+
 	BPath path;
 	for (uint i = 0; i < directoryCount; i++) {
 		path.SetTo(directories[i]);
@@ -249,6 +254,8 @@ AddOnManager::RegisterAddOns()
 		return;
 	}
 
+	MemoryDeleter directoriesDeleter(directories);
+
 	BPath path;
 	for (uint i = 0; i < directoryCount; i++) {
 		BDirectory directory;