diff --git a/src/w_wad.c b/src/w_wad.c
index 72ed4413be34ac91cc5daf812ad5ae9321a44699..51e5e7ab991738f7890a6dfb5c4ea4454fbe8c3f 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1359,7 +1359,8 @@ void W_GetFolderLumpsPwad(const char *name, UINT16 wad, UINT32 **list, UINT16 *l
 	{
 		if (strnicmp(name, lump_p->fullname, name_length) == 0)
 		{
-			if (strlen(lump_p->fullname) > name_length)
+			if (strlen(lump_p->fullname) > name_length
+				&& lump_p->longname[0] != '\0')
 			{
 				if (!capacity || count >= capacity)
 				{