diff --git a/resources/mkgmap-version.properties b/resources/mkgmap-version.properties
index 58a7fd7..d0f7a46 100644
--- a/resources/mkgmap-version.properties
+++ b/resources/mkgmap-version.properties
@@ -1,2 +1,2 @@
-svn.version: 4806
-build.timestamp: 2021-08-10T09:45:55+0100
+svn.version: 4807
+build.timestamp: 2021-09-14T09:45:24+0100
diff --git a/src/uk/me/parabola/mkgmap/main/Main.java b/src/uk/me/parabola/mkgmap/main/Main.java
index 004d266..326693d 100644
--- a/src/uk/me/parabola/mkgmap/main/Main.java
+++ b/src/uk/me/parabola/mkgmap/main/Main.java
@@ -19,11 +19,11 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryType;
 import java.lang.management.MemoryUsage;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.time.Duration;
 import java.time.Instant;
@@ -613,7 +613,7 @@
 		for (Combiner c : combiners)
 			c.init(args);
 
-		filenames.removeIf(f -> f == null || f.isCancelled());
+		filenames.removeIf(f -> f == null || f.getFilename() == null || f.isCancelled());
 
 		final Map<String, Integer> nameToHex = new HashMap<>();
 		for (FilenameTask f : filenames) {