diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs
index 21a4f77ffe..d8e10f8445 100644
--- a/OpenRA.Game/Map/MapPreview.cs
+++ b/OpenRA.Game/Map/MapPreview.cs
@@ -486,8 +486,13 @@ namespace OpenRA
 						Game.RunAfterTick(() =>
 						{
 							var package = modData.ModFiles.OpenPackage(mapFilename, mapInstallPackage);
-							UpdateFromMap(package, mapInstallPackage, MapClassification.User, null, GridType);
-							onSuccess();
+							if (package == null)
+								innerData.Status = MapStatus.DownloadError;
+							else
+							{
+								UpdateFromMap(package, mapInstallPackage, MapClassification.User, null, GridType);
+								onSuccess();
+							}
 						});
 					};