diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua
index 1b3ac48..b0e0ebb 100644
--- a/src/adv/Adv.lua
+++ b/src/adv/Adv.lua
@@ -958,6 +958,7 @@ local function clickMonster(self, room, block, params)
 end
 
 local function chooseCommon(self, room, block, chooseData, choose, tag)
+	if not choose then return end
 	if not chooseData or not chooseData["button".. choose .."cond"] then return end
 
 	local cond = chooseData["button".. choose .."cond"]:toArray(true, "=")
diff --git a/src/adv/AdvPassive.lua b/src/adv/AdvPassive.lua
index dafb339..56966ec 100644
--- a/src/adv/AdvPassive.lua
+++ b/src/adv/AdvPassive.lua
@@ -145,7 +145,9 @@ PassiveCondFactory[Passive.OPEN_BLOCK] = PassiveCondFactory[Passive.HURT_PERCENT
 PassiveCondFactory[Passive.SELF_HURT] = function(_Passive)
 	_Passive._trigger = function(self, params)
 		local buffId = params.buffId
+		if not buffId then return end
 		local data = csvdb["adv_map_buffCsv"][buffId]
+		if not data then return end
 		if data.classify:sismember(self.passiveData.value, " ") then
 			return true
 		end
--
libgit2 0.21.2