diff --git a/WeakAuras/GenericTrigger.lua b/WeakAuras/GenericTrigger.lua
index c244a9c..7872633 100644
--- a/WeakAuras/GenericTrigger.lua
+++ b/WeakAuras/GenericTrigger.lua
@@ -76,9 +76,6 @@ local ConstructTest, ConstructFunction
 
 local nameplateExists = {}
 
----@param unit UnitToken
----@param smart? boolean
----@return boolean unitExists
 function WeakAuras.UnitExistsFixed(unit, smart)
   if #unit > 9 and unit:sub(1, 9) == "nameplate" then
     return nameplateExists[unit]
diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 2c662b5..202d8c1 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -6379,7 +6379,7 @@ Private.event_prototypes = {
       trigger.unit = trigger.unit or "target";
       local ret = [[
         unit = string.lower(unit)
-        local name = UnitName(unit, false)
+        local name = UnitName(unit, false) or (unit == "none" and "Unknown")
         local ok = true
         local aggro, status, threatpct, rawthreatpct, threatvalue, threattotal
         if unit and unit ~= "none" then
@@ -6530,7 +6530,7 @@ Private.event_prototypes = {
       },
       {
         hidden = true,
-        test = "WeakAuras.UnitExistsFixed(unit, false) and specificUnitCheck"
+        test = "((WeakAuras.UnitExistsFixed(unit, false) or unit == 'none') and specificUnitCheck)"
       }
     },
     automaticrequired = true