diff --git a/OpenRa.Game/Graphics/Minimap.cs b/OpenRa.Game/Graphics/Minimap.cs
index 5067dc13f3..b702f8ddd5 100644
--- a/OpenRa.Game/Graphics/Minimap.cs
+++ b/OpenRa.Game/Graphics/Minimap.cs
@@ -127,7 +127,7 @@ namespace OpenRa.Graphics
 				var colors = terrainTypeColors[world.Map.Theater.ToLowerInvariant()];
 				int* c = (int*)bitmapData.Scan0;
 
-				foreach (var a in world.Queries.WithTrait<Unit>())
+				foreach (var a in world.Queries.WithTrait<Unit>().Where( a => a.Actor.Owner != null ))
 					*(c + (a.Actor.Location.Y * bitmapData.Stride >> 2) + a.Actor.Location.X) =
 						Color.FromArgb(alpha, a.Actor.Owner.Color).ToArgb();
 
diff --git a/mods/ra/rules.yaml b/mods/ra/rules.yaml
index 7914d19e71..72ad518882 100644
--- a/mods/ra/rules.yaml
+++ b/mods/ra/rules.yaml
@@ -547,7 +547,7 @@ DOME:
 
 CRATE:
 	Crate:
-		Lifetime: 5
+		Lifetime: 120
 	SpeedUpgradeCrateAction:
 		Multiplier: 1.7
 		SelectionShares: 10