From 0d8557eadb47179a8a8dc9b75b0729fa1328d20c Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 10 Oct 2010 11:04:39 +1300
Subject: [PATCH] fix NRE in CancelableActivity

---
 OpenRA.Game/Traits/TraitsInterfaces.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index 4160141177..5152adbc34 100644
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -188,7 +188,7 @@ namespace OpenRA.Traits
 			IsCanceled = OnCancel();
 			if( IsCanceled )
 				NextActivity = null;
-			else
+			else if (NextActivity != null)
 				NextActivity.Cancel( self );
 		}