diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index a2a5a6883b..98a893391b 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -1398,8 +1398,7 @@ void PPointer::WriteValue(FSerializer &ar, const char *key,const void *addr) con
 	}
 	else
 	{
-		assert(0 && "Pointer points to a type we don't handle");
-		I_Error("Attempt to save pointer to unhandled type");
+		I_Error("Attempt to save pointer to unhandled type %s", PointedType->DescriptiveName());
 	}
 }
 
diff --git a/src/g_game.cpp b/src/g_game.cpp
index b39ee52a8d..4391a05710 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -2270,7 +2270,29 @@ void G_DoSaveGame (bool okForQuicksave, FString filename, const char *descriptio
 		I_FreezeTime(true);
 
 	insave = true;
-	G_SnapshotLevel ();
+	try
+	{
+		G_SnapshotLevel();
+	}
+	catch(CRecoverableError &err)
+	{
+		// delete the snapshot. Since the save failed it is broken.
+		insave = false;
+		level.info->Snapshot.Clean();
+		Printf(PRINT_HIGH, "Save failed\n");
+		Printf(PRINT_HIGH, "%s\n", err.GetMessage());
+		// The time freeze must be reset if the save fails.
+		if (cl_waitforsave)
+			I_FreezeTime(false);
+		return;
+	}
+	catch (...)
+	{
+		insave = false;
+		if (cl_waitforsave)
+			I_FreezeTime(false);
+		throw;
+	}
 
 	BufferWriter savepic;
 	FSerializer savegameinfo;		// this is for displayable info about the savegame