diff --git a/src/client/cl_cin.c b/src/client/cl_cin.c
index c290294f..c550e145 100644
--- a/src/client/cl_cin.c
+++ b/src/client/cl_cin.c
@@ -912,7 +912,10 @@ SCR_PlayCinematic(char *arg)
 	dot = strstr(arg, ".");
 
 	/* static pcx image */
-	if (dot && !strcmp(dot, ".pcx"))
+	if (dot && (!strcmp(dot, ".pcx") ||
+				!strcmp(dot, ".tga") ||
+				!strcmp(dot, ".jpg") ||
+				!strcmp(dot, ".png")))
 	{
 		cvar_t	*r_retexturing;
 
diff --git a/src/common/collision.c b/src/common/collision.c
index c94eaee4..c1d42432 100644
--- a/src/common/collision.c
+++ b/src/common/collision.c
@@ -371,7 +371,8 @@ CM_InitBoxHull(void)
 		(cmod->numbrushsides <= 0) ||
 		(cmod->numplanes <= 0))
 	{
-		Com_Error(ERR_DROP, "%s: Not enough room for box tree", __func__);
+		Com_Printf("%s: Not enough room for box tree\n", __func__);
+		return;
 	}
 
 	box_brush = &cmod->map_brushes[cmod->numbrushes];
@@ -1933,9 +1934,10 @@ CM_LoadCachedMap(const char *name, model_t *mod)
 
 	length = FS_LoadFile(name, (void **)&buf);
 
-	if (!buf)
+	if (!buf || length <= 0)
 	{
-		Com_Error(ERR_DROP, "%s: Couldn't load %s", name, __func__);
+		Com_Printf("%s: Couldn't load %s\n", __func__, name);
+		return;
 	}
 
 	mod->checksum = LittleLong(Com_BlockChecksum(buf, length));
diff --git a/src/server/sv_cmd.c b/src/server/sv_cmd.c
index 657c1ea9..5e22d77c 100644
--- a/src/server/sv_cmd.c
+++ b/src/server/sv_cmd.c
@@ -259,7 +259,6 @@ SV_GameMap_f(void)
 		}
 	}
 
-
 	/* start up the next map */
 	SV_Map(false, map, false, false);
 
diff --git a/src/server/sv_init.c b/src/server/sv_init.c
index 29577cc3..f2475c41 100644
--- a/src/server/sv_init.c
+++ b/src/server/sv_init.c
@@ -569,7 +569,10 @@ SV_Map(qboolean attractloop, char *levelstring, qboolean loadgame, qboolean isau
 		SV_BroadcastCommand("changing\n");
 		SV_SpawnServer(level, spawnpoint, ss_demo, attractloop, loadgame, isautosave);
 	}
-	else if ((l > 4) && !strcmp(level + l - 4, ".pcx"))
+	else if ((l > 4) && (!strcmp(level + l - 4, ".pcx") ||
+						!strcmp(level + l - 4, ".tga") ||
+						!strcmp(level + l - 4, ".jpg") ||
+						!strcmp(level + l - 4, ".png")))
 	{
 #ifndef DEDICATED_ONLY
 		SCR_BeginLoadingPlaque(); /* for local system */