diff --git a/Embedded/Moose_Embedded.lua b/Embedded/Moose_Embedded.lua
index 8a632d371..6b5c9c5c1 100644
--- a/Embedded/Moose_Embedded.lua
+++ b/Embedded/Moose_Embedded.lua
@@ -10669,10 +10669,10 @@ end
 
 
 
---- Will re-spawn a group based on a given index.
+--- Will spawn a group based on the internal index.
 -- Note: Uses @{DATABASE} module defined in MOOSE.
 -- @param self
--- @return GROUP#GROUP The group that was spawned. You can use this group for further actions.
+-- @return Group#GROUP The group that was spawned. You can use this group for further actions.
 function SPAWN:Spawn()
 	self:F( { self.SpawnTemplatePrefix, self.SpawnIndex } )
 
@@ -10683,7 +10683,7 @@ end
 -- Note: Uses @{DATABASE} module defined in MOOSE.
 -- @param self
 -- @param #string SpawnIndex The index of the group to be spawned.
--- @return GROUP#GROUP The group that was spawned. You can use this group for further actions.
+-- @return Group#GROUP The group that was spawned. You can use this group for further actions.
 function SPAWN:ReSpawn( SpawnIndex )
 	self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
 	
@@ -10702,7 +10702,7 @@ end
 --- Will spawn a group with a specified index number.
 -- Uses @{DATABASE} global object defined in MOOSE.
 -- @param #SPAWN self
--- @return GROUP#GROUP The group that was spawned. You can use this group for further actions.
+-- @return Group#GROUP The group that was spawned. You can use this group for further actions.
 function SPAWN:SpawnWithIndex( SpawnIndex )
 	self:F( { self.SpawnTemplatePrefix, SpawnIndex, self.SpawnMaxGroups } )
 	
@@ -10873,7 +10873,7 @@ end
 -- @param self
 -- @param #ZONE Zone The zone where the group is to be spawned.
 -- @param #number SpawnIndex (Optional) The index which group to spawn within the given zone.
--- @return GROUP#GROUP that was spawned.
+-- @return Group#GROUP that was spawned.
 -- @return #nil when nothing was spawned.
 function SPAWN:SpawnInZone( Zone, SpawnIndex )
 	self:F( { self.SpawnTemplatePrefix, Zone, SpawnIndex } )
@@ -10946,7 +10946,7 @@ end
 --- Will return the SpawnGroupName either with with a specific count number or without any count.
 -- @param self
 -- @param #number SpawnIndex Is the number of the Group that is to be spawned.
--- @return string SpawnGroupName
+-- @return #string SpawnGroupName
 function SPAWN:SpawnGroupName( SpawnIndex )
 	self:F( { self.SpawnTemplatePrefix, SpawnIndex } )
 
@@ -10969,7 +10969,7 @@ end
 --- Find the first alive group.
 -- @param self
 -- @param #number SpawnCursor A number holding the index from where to find the first group from.
--- @return GROUP#GROUP, #number The group found, the new index where the group was found.
+-- @return Group#GROUP, #number The group found, the new index where the group was found.
 -- @return #nil, #nil When no group is found, #nil is returned.
 function SPAWN:GetFirstAliveGroup( SpawnCursor )
 	self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnCursor } )
@@ -10989,7 +10989,7 @@ end
 --- Find the next alive group.
 -- @param self
 -- @param #number SpawnCursor A number holding the last found previous index.
--- @return GROUP#GROUP, #number The group found, the new index where the group was found.
+-- @return Group#GROUP, #number The group found, the new index where the group was found.
 -- @return #nil, #nil When no group is found, #nil is returned.
 function SPAWN:GetNextAliveGroup( SpawnCursor )
 	self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnCursor } )
@@ -11030,7 +11030,7 @@ end
 -- If no index is given, it will return the first group in the list.
 -- @param self
 -- @param #number SpawnIndex The index of the group to return.
--- @return GROUP#GROUP
+-- @return Group#GROUP
 function SPAWN:GetGroupFromIndex( SpawnIndex )
 	self:F( { self.SpawnTemplatePrefix, self.SpawnAliasPrefix, SpawnIndex } )
 	
@@ -12159,7 +12159,7 @@ function ESCORT._ROE( MenuParam )
   local EscortROEFunction = MenuParam.ParamFunction
   local EscortROEMessage = MenuParam.ParamMessage
   
-  EscortROEFunction()
+  pcall( function() EscortROEFunction() end )
   EscortGroup:MessageToClient( EscortROEMessage, 10, EscortClient )
 end
 
@@ -12173,7 +12173,7 @@ function ESCORT._ROT( MenuParam )
   local EscortROTFunction = MenuParam.ParamFunction
   local EscortROTMessage = MenuParam.ParamMessage
 
-  EscortROTFunction()
+  pcall( function() EscortROTFunction() end )
   EscortGroup:MessageToClient( EscortROTMessage, 10, EscortClient )
 end
 
diff --git a/Moose/Escort.lua b/Moose/Escort.lua
index 038a8dc7b..58016bb26 100644
--- a/Moose/Escort.lua
+++ b/Moose/Escort.lua
@@ -393,7 +393,7 @@ function ESCORT._ROE( MenuParam )
   local EscortROEFunction = MenuParam.ParamFunction
   local EscortROEMessage = MenuParam.ParamMessage
   
-  EscortROEFunction()
+  pcall( function() EscortROEFunction() end )
   EscortGroup:MessageToClient( EscortROEMessage, 10, EscortClient )
 end
 
@@ -407,7 +407,7 @@ function ESCORT._ROT( MenuParam )
   local EscortROTFunction = MenuParam.ParamFunction
   local EscortROTMessage = MenuParam.ParamMessage
 
-  EscortROTFunction()
+  pcall( function() EscortROTFunction() end )
   EscortGroup:MessageToClient( EscortROTMessage, 10, EscortClient )
 end
 
diff --git a/Test Missions/miz/MOOSE_Escort_Test_Follow.miz b/Test Missions/miz/MOOSE_Escort_Test_Follow.miz
index 77f3e6a55..25366b60e 100644
Binary files a/Test Missions/miz/MOOSE_Escort_Test_Follow.miz and b/Test Missions/miz/MOOSE_Escort_Test_Follow.miz differ