diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua
index 6c220e7..b349007 100644
--- a/src/actions/AdvAction.lua
+++ b/src/actions/AdvAction.lua
@@ -655,7 +655,7 @@ function _M.startBattleRpc(agent, data)
 	if adv:isWaitChooseArtifact() then return end
 	local enemy = adv.battle:getEnemyById(enemyId)
 
-	if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
+	if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
 
 	local key = tostring(math.random())
 	adv.__battleCache = {
@@ -687,7 +687,7 @@ function _M.endBattleRpc(agent, data)
 	if not adv.__battleCache then return end
 	if adv.__battleCache.enemyId ~= enemyId then return end
 	local enemy = adv.battle:getEnemyById(enemyId)
-	if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
+	if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
 	adv.__battleCache = nil
 
 	-- 打完野猪怪
--
libgit2 0.21.2