diff --git a/OpenRA.Mods.RA/Harvester.cs b/OpenRA.Mods.RA/Harvester.cs index afe5580811..67f171b029 100644 --- a/OpenRA.Mods.RA/Harvester.cs +++ b/OpenRA.Mods.RA/Harvester.cs @@ -153,7 +153,7 @@ namespace OpenRA.Mods.RA { if (order.TargetActor != LinkedProc) { - if (LinkedProc != null) + if (LinkedProc != null && LinkedProc.IsInWorld) LinkedProc.TraitsImplementing().FirstOrDefault().UnlinkHarvester(LinkedProc,self); LinkedProc = order.TargetActor; LinkedProc.TraitsImplementing().FirstOrDefault().LinkHarvester(LinkedProc,self);