diff --git a/source/net/filebot/ui/rename/AutoDetectMatcher.java b/source/net/filebot/ui/rename/AutoDetectMatcher.java
index b9292462..04f31bd7 100644
--- a/source/net/filebot/ui/rename/AutoDetectMatcher.java
+++ b/source/net/filebot/ui/rename/AutoDetectMatcher.java
@@ -68,19 +68,27 @@ class AutoDetectMatcher implements AutoCompleteMatcher {
 	}
 
 	private List<Match<File, ?>> match(Group group, Collection<File> files, boolean strict, SortOrder order, Locale locale, boolean autodetection, Component parent) throws Exception {
-		for (Type key : group.types()) {
-			switch (key) {
-			case Movie:
-				return movie.match(files, strict, order, locale, autodetection, parent);
-			case Series:
-				return episode.match(files, strict, order, locale, autodetection, parent);
-			case Anime:
-				return anime.match(files, strict, order, locale, autodetection, parent);
-			case Music:
-				return music.match(files, strict, order, locale, autodetection, parent);
-			}
+		AutoCompleteMatcher m = getMatcher(group);
+		if (m != null) {
+			return m.match(files, strict, order, locale, autodetection, parent);
 		}
 		return emptyList();
 	}
 
+	private AutoCompleteMatcher getMatcher(Group group) {
+		for (Type key : group.types()) {
+			switch (key) {
+			case Movie:
+				return movie;
+			case Series:
+				return episode;
+			case Anime:
+				return anime;
+			case Music:
+				return music;
+			}
+		}
+		return null;
+	}
+
 }