diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua
index e79dea2df..6cdf05da7 100644
--- a/Moose Development/Moose/Core/Database.lua	
+++ b/Moose Development/Moose/Core/Database.lua	
@@ -1362,7 +1362,7 @@ end
 -- @return #DATABASE self
 function DATABASE:_RegisterDynamicGroup(Groupname)
   local DCSGroup = Group.getByName(Groupname)
-  if DCSGroup:isExist() then
+  if DCSGroup and DCSGroup:isExist() then
   
     -- Group name.
     local DCSGroupName = DCSGroup:getName()
diff --git a/Moose Development/Moose/Core/Spawn.lua b/Moose Development/Moose/Core/Spawn.lua
index b5fddf5c0..8a4f7aad8 100644
--- a/Moose Development/Moose/Core/Spawn.lua	
+++ b/Moose Development/Moose/Core/Spawn.lua	
@@ -3934,7 +3934,7 @@ function SPAWN:_OnDeadOrCrash( EventData )
    
     if EventPrefix then -- EventPrefix can be nil if no # is found, which means, no spawnable group!
       self:T( { "Dead event: " .. EventPrefix } )
-      self:T(string.format("EventPrefix = %s | SpawnAliasPrefix = %s  | Old AliveUnits = %d",EventPrefix,self.SpawnAliasPrefix,self.AliveUnits))
+      self:T(string.format("EventPrefix = %s | SpawnAliasPrefix = %s  | Old AliveUnits = %d",EventPrefix or "",self.SpawnAliasPrefix or "",self.AliveUnits or 0))
       if EventPrefix == self.SpawnTemplatePrefix or ( self.SpawnAliasPrefix and EventPrefix == self.SpawnAliasPrefix ) and self.AliveUnits > 0 then
        self.AliveUnits = self.AliveUnits - 1   
       end