diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs
index a14cb36785..f6264afc4c 100644
--- a/OpenRA.Game/Network/UnitOrders.cs
+++ b/OpenRA.Game/Network/UnitOrders.cs
@@ -338,15 +338,19 @@ namespace OpenRA.Network
 
 				default:
 					{
-						if (order.Subject != null && !order.Subject.IsDead)
-							foreach (var t in order.Subject.TraitsImplementing<IResolveOrder>())
-								t.ResolveOrder(order.Subject, order);
-
+						ResolveOrder(order);
 						break;
 					}
 			}
 		}
 
+		static void ResolveOrder(Order order)
+		{
+			if (order.Subject != null && !order.Subject.IsDead)
+				foreach (var t in order.Subject.TraitsImplementing<IResolveOrder>())
+					t.ResolveOrder(order.Subject, order);
+		}
+
 		static void SetOrderLag(OrderManager o)
 		{
 			if (o.FramesAhead != o.LobbyInfo.GlobalSettings.OrderLatency && !o.GameStarted)