diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 4adaf8e16e..0bca2e61e6 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -872,7 +872,7 @@ local hierarchy_methods = {
 local function hierarchy(method)
   local kind = hierarchy_methods[method]
   if not kind then
-    error('unsupported method ' .. method)
+    vim.notify(lsp._unsupported_method(method), vim.log.levels.WARN)
   end
 
   local prepare_method = kind == 'type' and ms.textDocument_prepareTypeHierarchy
@@ -1275,9 +1275,7 @@ function M.code_action(opts)
   local win = api.nvim_get_current_win()
   local clients = lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_codeAction })
   if not next(clients) then
-    if next(lsp.get_clients({ bufnr = bufnr })) then
-      vim.notify(lsp._unsupported_method(ms.textDocument_codeAction), vim.log.levels.WARN)
-    end
+    vim.notify(lsp._unsupported_method(ms.textDocument_codeAction), vim.log.levels.WARN)
     return
   end