diff --git a/lua/avante/selection.lua b/lua/avante/selection.lua
index 4dc8f10..318213f 100644
--- a/lua/avante/selection.lua
+++ b/lua/avante/selection.lua
@@ -161,7 +161,7 @@ function Selection:submit_input(input)
         response_lines[i] = original_first_line_indentation .. line
       end
     end
-    api.nvim_buf_set_lines(self.code_bufnr, start_line - 1, finish_line, true, response_lines)
+    pcall(function() api.nvim_buf_set_lines(self.code_bufnr, start_line - 1, finish_line, true, response_lines) end)
     finish_line = start_line + #response_lines - 1
   end
 
diff --git a/lua/avante/utils/init.lua b/lua/avante/utils/init.lua
index 69d9a4d..a4295da 100644
--- a/lua/avante/utils/init.lua
+++ b/lua/avante/utils/init.lua
@@ -986,7 +986,7 @@ function M.get_chat_mentions()
 end
 
 local function safe_open_file(filename)
-  local ok, _ = pcall(vim.cmd, "noautocmd edit " .. filename)
+  local ok, _ = pcall(function() vim.cmd("noautocmd edit " .. filename) end)
   if ok then
     -- Manually trigger necessary events
     vim.cmd("doautocmd BufRead")