diff --git a/WeakAuras/BuffTrigger.lua b/WeakAuras/BuffTrigger.lua
index b8cea96..ff2b4ed 100644
--- a/WeakAuras/BuffTrigger.lua
+++ b/WeakAuras/BuffTrigger.lua
@@ -1208,6 +1208,7 @@ do
       -- Note: Using UNIT_AURA in addition to COMBAT_LOG_EVENT_UNFILTERED,
       -- because the combat log event does not contain duration information
       local uid = ...;
+      if not uid then return end
       local guid = UnitGUID(uid);
 
       for spellName, auras in pairs(loaded_auras) do
@@ -1376,6 +1377,7 @@ frame:SetScript("OnEvent", function (frame, event, arg1, arg2, ...)
       WeakAuras.ScanAuras(unit);
     end
   elseif(event == "UNIT_AURA") then
+    if not arg1 then return end
     if(
       loaded_auras[arg1]
       or (
diff --git a/WeakAuras/BuffTrigger2.lua b/WeakAuras/BuffTrigger2.lua
index 94e7f97..5614d56 100644
--- a/WeakAuras/BuffTrigger2.lua
+++ b/WeakAuras/BuffTrigger2.lua
@@ -1300,7 +1300,7 @@ local function UpdateStates(matchDataChanged, time)
 end
 
 local function ScanGroupUnit(time, matchDataChanged, unitType, unit)
-  local unitExists = UnitExists(unit)
+  local unitExists = UnitExists(unit) == 1 and true or false
   if existingUnits[unit] ~= unitExists then
     existingUnits[unit] = unitExists
 
@@ -1522,6 +1522,7 @@ local function EventHandler(frame, event, arg1, arg2, ...)
       ScanGroupUnit(time, matchDataChanged, nil, "vehicle")
     end
   elseif event == "UNIT_AURA" then
+    if not arg1 then return end
     ScanUnit(time, arg1)
   elseif event == "PLAYER_ENTERING_WORLD" then
     for unit in pairs(matchData) do
@@ -1700,7 +1701,7 @@ local function LoadAura(id, triggernum, triggerInfo)
     tinsert(unitExistScanFunc[triggerInfo.unit][id], triggerInfo)
 
     if existingUnits[triggerInfo.unit] == nil then
-      existingUnits[triggerInfo.unit] = UnitExists(triggerInfo.unit)
+      existingUnits[triggerInfo.unit] = UnitExists(triggerInfo.unit) == 1 and true or false
     end
   end
 
@@ -3023,6 +3024,7 @@ function BuffTrigger.HandleMultiEvent(frame, event, ...)
     ReleaseUID(unit)
   elseif event == "UNIT_AURA" then
     local unit = ...
+    if not unit then return end
     local guid = UnitGUID(unit)
     if matchDataMulti[guid] then
       CheckAurasMulti(matchDataMulti[guid], unit, "HELPFUL")
diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index 0e34ec7..206ec53 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -95,7 +95,7 @@ function WeakAuras.UnitExistsFixed(unit, smart)
       return false
     end
   end
-  return UnitExists(unit)
+  return UnitExists(unit) == 1 and true or false
 end
 
 function WeakAuras.split(input)