diff --git a/src/d_main.cpp b/src/d_main.cpp
index ab24597886..930b0f6296 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2031,7 +2031,7 @@ static void AddAutoloadFiles(const char *group, const char *autoname)
 		D_AddConfigWads (allwads, file);
 
 		// Add group-specific wads
-		if (group != NULL)
+		if (group != NULL && group[0] != 0)
 		{
 			file = group;
 			file += ".Autoload";
@@ -2039,7 +2039,7 @@ static void AddAutoloadFiles(const char *group, const char *autoname)
 		}
 
 		// Add IWAD-specific wads
-		if (autoname != NULL)
+		if (autoname != NULL && autoname[0] != 0)
 		{
 			file = autoname;
 			file += ".Autoload";