diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua
index 7d080fcf2..623005ae2 100644
--- a/Moose Development/Moose/Core/Event.lua	
+++ b/Moose Development/Moose/Core/Event.lua	
@@ -714,6 +714,10 @@ function EVENT:onEvent( Event )
       Event.IniDCSUnitName = Event.IniDCSUnit:getName()
       Event.IniUnitName = Event.IniDCSUnitName
       Event.IniUnit = UNIT:FindByName( Event.IniDCSUnitName )
+      if not Event.IniUnit then
+        -- Unit can be a CLIENT. Most likely this will be the case ...
+        Event.IniUnit = CLIENT:FindByName( Event.IniDCSUnitName )
+      end
       Event.IniDCSGroupName = ""
       if Event.IniDCSGroup and Event.IniDCSGroup:isExist() then
         Event.IniDCSGroupName = Event.IniDCSGroup:getName()
diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua
index 9c003fa8c..716d051ff 100644
--- a/Moose Development/Moose/Tasking/Task.lua	
+++ b/Moose Development/Moose/Tasking/Task.lua	
@@ -112,12 +112,13 @@ function TASK_BASE:New( Mission, SetGroupAssign, TaskName, TaskType )
     function( self, EventData )
       self:E( EventData )
       self:E( { "State", self:GetState() } )
-      local TaskUnit = EventData.IniDCSUnit
+      local TaskUnit = EventData.IniUnit
       local TaskGroup = EventData.IniUnit:GetGroup()
-      self:__AssignUnit( 1, TaskUnit )
+      self:SetMenuForGroup(TaskGroup)
       if self:IsStateAssigned() then
-        self:E( self.SetGroup:IsIncludeObject( TaskGroup ) )
-        if self.SetGroup:IsIncludeObject( TaskGroup ) then
+        self:E( self:IsAssignedToGroup( TaskGroup ) )
+        if self:IsAssignedToGroup( TaskGroup ) then
+          self:AssignToUnit( TaskUnit )
         end
       end
       self:MessageToGroups( TaskUnit:GetPlayerName() .. " joined Task " .. self:GetName() )
@@ -254,14 +255,6 @@ function TASK_BASE:AssignToUnit( TaskUnit )
   local FsmUnit = self:SetStateMachine( TaskUnit, FsmTemplate:Copy( TaskUnit, self ) ) -- Fsm.Fsm#FSM_PROCESS
   self:E({"Address FsmUnit", tostring( FsmUnit ) } )
   
-  -- Set the events
-  FsmUnit:EventOnPilotDead( 
-    --- @param Core.Event#EVENTDATA EventData
-    function( self, EventData )
-      self:__Fail( 1 )
-    end
-    )
-
   FsmUnit:SetStartState( "Planned" )
   FsmUnit:Accept() -- Each Task needs to start with an Accept event to start the flow.
 
diff --git a/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz b/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz
index ccf0cdd03..71460895e 100644
Binary files a/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz and b/Moose Test Missions/TSK - Task Modelling/TSK-010 - Task Modelling - SEAD/TSK-010 - Task Modelling - SEAD.miz differ