diff --git a/config/nvim/lua/fschauen/lazy.lua b/config/nvim/lua/fschauen/lazy.lua
index 4fed18a..edb520c 100644
--- a/config/nvim/lua/fschauen/lazy.lua
+++ b/config/nvim/lua/fschauen/lazy.lua
@@ -11,8 +11,7 @@ local get_lazy = function()
     }
   end
   vim.opt.rtp:prepend(path)
-  local _, lazy = pcall(require, 'lazy')
-  return lazy
+  return vim.F.npcall(require, 'lazy')
 end
 
 local lazy = get_lazy()
diff --git a/config/nvim/lua/fschauen/plugins/lsp.lua b/config/nvim/lua/fschauen/plugins/lsp.lua
index d03325e..43e252e 100644
--- a/config/nvim/lua/fschauen/plugins/lsp.lua
+++ b/config/nvim/lua/fschauen/plugins/lsp.lua
@@ -35,8 +35,8 @@ local config = function()
     end,
   }
 
-  local has_cmp, cmp = pcall(require, 'cmp_nvim_lsp')
-  if has_cmp then
+  local cmp = vim.F.npcall(require, 'cmp_nvim_lsp')
+  if cmp then
     vim.tbl_deep_extend('force', opts.capabilities, cmp.default_capabilities())
   end
 
diff --git a/config/nvim/lua/fschauen/plugins/lualine.lua b/config/nvim/lua/fschauen/plugins/lualine.lua
index 9bdb21b..297b590 100644
--- a/config/nvim/lua/fschauen/plugins/lualine.lua
+++ b/config/nvim/lua/fschauen/plugins/lualine.lua
@@ -73,9 +73,12 @@ local config = function()
     },
 
     visual_multi = function()
-      local ok, infos = pcall(vim.fn.VMInfos)
-      if not ok or not infos.status then return '' end
-      return infos.current .. '/' .. infos.total .. ' ' .. infos.status
+      local info = vim.F.npcall(vim.fn.VMInfos)
+      if info and info.status then
+        return info.current .. '/' .. info.total .. ' ' .. info.status
+      else
+        return ''
+      end
     end,
 
     branch = {
diff --git a/config/nvim/lua/fschauen/plugins/telescope.lua b/config/nvim/lua/fschauen/plugins/telescope.lua
index e36cb13..cb87807 100644
--- a/config/nvim/lua/fschauen/plugins/telescope.lua
+++ b/config/nvim/lua/fschauen/plugins/telescope.lua
@@ -17,8 +17,8 @@ local config = function()
     ['<c-k>'] = actions.cycle_history_prev,
   }
 
-  local has_trouble, trouble = pcall(require, 'trouble.providers.telescope')
-  if has_trouble then
+  local trouble = vim.F.npcall(require, 'trouble.providers.telescope')
+  if trouble then
     mappings['<c-b>'] = trouble.open_with_trouble
   end