diff --git a/neovim/lua/config/bufferline.lua b/neovim/lua/config/bufferline.lua
index b8ac0e3..594d17f 100644
--- a/neovim/lua/config/bufferline.lua
+++ b/neovim/lua/config/bufferline.lua
@@ -1,4 +1,10 @@
-require("bufferline").setup{
+local ok, bufferline = pcall(require, "bufferline")
+
+if not ok then
+  return
+end
+
+bufferline.setup{
   options = {
     always_show_bufferline = true,
     mode = "buffers",
diff --git a/neovim/lua/config/lsp.lua b/neovim/lua/config/lsp.lua
index b6cd5ca..59a723d 100644
--- a/neovim/lua/config/lsp.lua
+++ b/neovim/lua/config/lsp.lua
@@ -1,3 +1,9 @@
+local ok, lspconfig = pcall(require, "lspconfig")
+
+if not ok then
+  return
+end
+
 local custom_attach = function(client, bufnr)
   local function buf_set_keymap(...)
     vim.api.nvim_buf_set_keymap(bufnr, ...)
@@ -32,7 +38,7 @@ local custom_attach = function(client, bufnr)
 end
 
 -- Go
-require("lspconfig").gopls.setup{
+lspconfig.gopls.setup{
   on_attach = custom_attach,
   cmd = {"gopls", "serve"},
   settings = {
@@ -52,23 +58,23 @@ require("lspconfig").gopls.setup{
 
 -- Golangci-lint language server
 -- requires golangci-lint and golangci-lint-langserver
-require("lspconfig").golangci_lint_ls.setup{}
+lspconfig.golangci_lint_ls.setup{}
 
 -- Jsonnet
-require("lspconfig").jsonnet_ls.setup{
+lspconfig.jsonnet_ls.setup{
   on_attach = custom_attach,
 }
 
 -- Terraform
-require("lspconfig").terraformls.setup{
+lspconfig.terraformls.setup{
   on_attach = custom_attach,
   cmd       = {"terraform-ls", "serve"},
   filetypes = {"terraform", "hcl", "tf"},
-  root_dir  = require("lspconfig").util.root_pattern{".terraform", ".git", "main.tf"},
+  root_dir  = lspconfig.util.root_pattern{".terraform", ".git", "main.tf"},
 }
 
 -- Python
-require("lspconfig").pylsp.setup{
+lspconfig.pylsp.setup{
   on_attach = custom_attach,
   cmd       = { "pylsp" },
   filetypes = { "python" },
@@ -78,7 +84,7 @@ require("lspconfig").pylsp.setup{
 local sumneko_root_path = vim.fn.expand('$HOME') .. "/Git/github.com/sumneko/lua-language-server"
 local sumneko_binary = sumneko_root_path .. "/bin/Linux/lua-language-server"
 
-require("lspconfig").sumneko_lua.setup {
+lspconfig.sumneko_lua.setup {
   on_attach = custom_attach,
   cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"},
   settings = {
diff --git a/neovim/lua/config/treesitter.lua b/neovim/lua/config/treesitter.lua
index e8c2411..c3f51d1 100644
--- a/neovim/lua/config/treesitter.lua
+++ b/neovim/lua/config/treesitter.lua
@@ -1,4 +1,10 @@
-require("nvim-treesitter.configs").setup {
+local ok, treesitter = pcall(require, "nvim-treesitter.configs")
+
+if not ok then
+  return
+end
+
+treesitter.setup {
   ensure_installed = {
     "bash",
     "go",