diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
index 191d62287..27ec6c0e0 100644
--- a/Moose Development/Moose/Core/Set.lua	
+++ b/Moose Development/Moose/Core/Set.lua	
@@ -89,7 +89,6 @@ do -- SET_BASE
     Index = {},
     Database = nil,
     CallScheduler = nil,
-    Filter = {},
     FilterCoalitionNumbers = {
       [coalition.side.RED+1] = "red",
       [coalition.side.BLUE+1] = "blue",
diff --git a/Moose Development/Moose/Functional/Shorad.lua b/Moose Development/Moose/Functional/Shorad.lua
index 526ff062f..bc5156943 100644
--- a/Moose Development/Moose/Functional/Shorad.lua	
+++ b/Moose Development/Moose/Functional/Shorad.lua	
@@ -684,6 +684,7 @@ do
     local ShootingWeapon = EventData.Weapon -- Identify the weapon fired
     local ShootingWeaponName = EventData.WeaponName -- return weapon type
     -- get firing coalition
+    if not EventData.IniGroup then return self end
     local weaponcoalition = EventData.IniGroup:GetCoalition()
     -- get detection probability
     if self:_CheckCoalition(weaponcoalition) then --avoid overhead on friendly fire
diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua
index 122ce7ab8..43df08964 100644
--- a/Moose Development/Moose/Ops/CTLD.lua	
+++ b/Moose Development/Moose/Ops/CTLD.lua	
@@ -7297,10 +7297,10 @@ end
           local type = cargo.CargoType
           local gname = cargo.Name
           local gcargo = self:_FindCratesCargoObject(gname) or self:_FindTroopsCargoObject(gname)
-          self:T("Looking at " .. gname .. " in the helo - type = " .. type)
+          self:T("Looking at " .. gname .. " in the helo - type = "..tostring(type))
           if (type == CTLD_CARGO.Enum.TROOPS or type == CTLD_CARGO.Enum.ENGINEERS or type == CTLD_CARGO.Enum.VEHICLE or type == CTLD_CARGO.Enum.FOB) then
             if gcargo and gcargo:GetStock0() > 0 then
-              self:T("Adding " .. gname .. " in the helo - type = " .. type)
+              self:T("Adding " .. gname .. " in the helo - type = "..tostring(type))
               if (type == CTLD_CARGO.Enum.TROOPS or type == CTLD_CARGO.Enum.ENGINEERS) then
                 Troopstable[gname].Inhelo = Troopstable[gname].Inhelo + 1
               end
diff --git a/Moose Development/Moose/Wrapper/Scenery.lua b/Moose Development/Moose/Wrapper/Scenery.lua
index d7e367e92..ea1f8f8f0 100644
--- a/Moose Development/Moose/Wrapper/Scenery.lua	
+++ b/Moose Development/Moose/Wrapper/Scenery.lua	
@@ -75,7 +75,7 @@ function SCENERY:Register( SceneryName, SceneryObject, SceneryZone )
     self.Vector = (self.Vec3 and VECTOR) and VECTOR:NewFromVec(self.Vec3) or nil
   end
 
-  if SceneryObject then
+  if SceneryObject and SceneryObject.getPoint then
     local vec3 = SceneryObject:getPoint()
     self.Vec3 = { x = vec3.x, y = vec3.y, z = vec3.z }
     self.Vec2 = { x = vec3.x, y = vec3.z }