From 51ec97fb2c3638a7135dadfe8dd352b30caacc85 Mon Sep 17 00:00:00 2001
From: TheChosenEvilOne <tceo-email@protonmail.com>
Date: Fri, 9 Nov 2018 12:44:28 +0200
Subject: [PATCH] Check for null in Turreted.StopAiming

---
 OpenRA.Mods.Common/Traits/Turreted.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Traits/Turreted.cs b/OpenRA.Mods.Common/Traits/Turreted.cs
index e04417e1f0..05edf3cd17 100644
--- a/OpenRA.Mods.Common/Traits/Turreted.cs
+++ b/OpenRA.Mods.Common/Traits/Turreted.cs
@@ -158,7 +158,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		public void StopAiming(Actor self)
 		{
-			if (attack.IsAiming)
+			if (attack != null && attack.IsAiming)
 				attack.OnStopOrder(self);
 		}