From 26ed4c24beeba25fd51c50d19ddc1c18aa51ceed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 9 Jul 2014 07:33:30 +0200
Subject: [PATCH] check if the host building is gone

fixes #5670
---
 OpenRA.Mods.RA/Activities/Rearm.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Mods.RA/Activities/Rearm.cs b/OpenRA.Mods.RA/Activities/Rearm.cs
index 3a2498b92e..71d6ed62ae 100644
--- a/OpenRA.Mods.RA/Activities/Rearm.cs
+++ b/OpenRA.Mods.RA/Activities/Rearm.cs
@@ -37,11 +37,13 @@ namespace OpenRA.Mods.RA.Activities
 				var hostBuilding = self.World.ActorMap.GetUnitsAt(self.Location)
 					.FirstOrDefault(a => a.HasTrait<RenderBuilding>());
 
+				if (hostBuilding == null || !hostBuilding.IsInWorld)
+					return NextActivity;
+
 				if (!limitedAmmo.GiveAmmo())
 					return NextActivity;
 
-				if (hostBuilding != null)
-					hostBuilding.Trait<RenderBuilding>().PlayCustomAnim(hostBuilding, "active");
+				hostBuilding.Trait<RenderBuilding>().PlayCustomAnim(hostBuilding, "active");
 
 				remainingTicks = limitedAmmo.ReloadTimePerAmmo();
 			}