diff --git a/source/net/sourceforge/filebot/media/MediaDetection.java b/source/net/sourceforge/filebot/media/MediaDetection.java
index c5f19131..2be0cb24 100644
--- a/source/net/sourceforge/filebot/media/MediaDetection.java
+++ b/source/net/sourceforge/filebot/media/MediaDetection.java
@@ -288,7 +288,7 @@ public class MediaDetection {
 			Set<String> folders = new LinkedHashSet<String>();
 			Set<String> filenames = new LinkedHashSet<String>();
 			for (File f : files) {
-				for (int i = 0; i < 3 && f != null; i++, f = f.getParentFile()) {
+				for (int i = 0; i < 3 && f != null && f.getParentFile() != null; i++, f = f.getParentFile()) {
 					(i == 0 ? filenames : folders).add(normalizeBrackets(getName(f)));
 				}
 			}
diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt
index ba89e0ba..ec1523cf 100644
--- a/website/data/release-groups.txt
+++ b/website/data/release-groups.txt
@@ -1484,6 +1484,7 @@ TvD
 TVFi
 TvNORGE
 TVP
+TvR
 TVS
 TvTiME
 TVTUPA