diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 03bbb4d8d..37110e388 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -4639,6 +4639,12 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
 		if (defaults->SpawnState == NULL ||
 			sprites[defaults->SpawnState->sprite].numframes == 0)
 		{
+			// We don't load mods for shareware games so we'll just ignore
+			// missing actors. Heretic needs this since the shareware includes
+			// the retail weapons in Deathmatch.
+			if (gameinfo.flags & GI_SHAREWARE)
+				return NULL;
+
 			Printf ("%s at (%i, %i) has no frames\n",
 					i->TypeName.GetChars(), mthing->x>>FRACBITS, mthing->y>>FRACBITS);
 			i = PClass::FindClass("Unknown");
diff --git a/wadsrc/static/mapinfo/hereticsw.txt b/wadsrc/static/mapinfo/hereticsw.txt
index 89b6c0762..5a37ccbef 100644
--- a/wadsrc/static/mapinfo/hereticsw.txt
+++ b/wadsrc/static/mapinfo/hereticsw.txt
@@ -4,5 +4,6 @@ gameinfo
 {
 	finalepage = "ORDER"
 	infopage = "ORDER", "HELP1", "HELP2", "CREDIT"
+	borderflat = "FLOOR04"
 }