From 48ea9dc30077d26fa10cd0f0fd14c3eb9c84c8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sun, 17 Apr 2016 14:19:24 +0200
Subject: [PATCH] Fix NRE if package download fails or is corrupted.

---
 OpenRA.Game/Map/MapPreview.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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();
+							}
 						});
 					};