diff --git a/3rdparty/mmu_man/themes/BeThemeImporter.cpp b/3rdparty/mmu_man/themes/BeThemeImporter.cpp
index 71d56b8e6d..ac666de217 100644
--- a/3rdparty/mmu_man/themes/BeThemeImporter.cpp
+++ b/3rdparty/mmu_man/themes/BeThemeImporter.cpp
@@ -87,7 +87,7 @@ status_t BeThemeImporter::ImportNextTheme(BMessage **theme)
 		return err;
 	err = settingsDir.SetTo(&dir, "Settings");
 	if (err < 0)
-		return err;
+		return B_ERROR;
 	PRINT(("BeThemeImporter: importing from '%s'\n", path.Path()));
 		
 	BMessage global(Z_THEME_MESSAGE_WHAT);
@@ -105,7 +105,7 @@ status_t BeThemeImporter::ImportNextTheme(BMessage **theme)
 
 	err = file.SetTo(&settingsDir, "Description", B_READ_ONLY);
 	if (err < B_OK)
-		return err;
+		return B_ERROR;
 	BString str;
 	char *buff;
 	buff = str.LockBuffer(1024);
@@ -120,7 +120,7 @@ status_t BeThemeImporter::ImportNextTheme(BMessage **theme)
 	
 	err = file.SetTo(&settingsDir, "Deskbar", B_READ_ONLY);
 	if (err < B_OK)
-		return err;
+		return B_ERROR;
 	str = "";
 	buff = str.LockBuffer(1024);
 	memset(buff, 0, 1024);
@@ -151,7 +151,7 @@ status_t BeThemeImporter::ImportNextTheme(BMessage **theme)
 	
 	err = file.SetTo(&settingsDir, "WorkSpaces", B_READ_ONLY);
 	if (err < B_OK)
-		return err;
+		return B_ERROR;
 	buff = str.LockBuffer(1024);
 	memset(buff, 0, 1024);
 	file.Read(buff, 1024);
diff --git a/3rdparty/mmu_man/themes/ThemeManager.cpp b/3rdparty/mmu_man/themes/ThemeManager.cpp
index fbf192798f..c4ad8c09fa 100644
--- a/3rdparty/mmu_man/themes/ThemeManager.cpp
+++ b/3rdparty/mmu_man/themes/ThemeManager.cpp
@@ -990,8 +990,9 @@ status_t ThemeManager::ImportThemesFor(int32 index, const char *path)
 	err = importer->FetchThemes();
 	if (err < 0)
 		return err;
-	while ((importer->ImportNextTheme(&theme)) >= 0) {
-		AddTheme(theme);
+	while ((err = importer->ImportNextTheme(&theme)) != ENOENT) {
+		if (err >= 0)
+			AddTheme(theme);
 	}
 	importer->EndImports();