diff --git a/nvim/init.lua b/nvim/init.lua
index 466c22b..53626ea 100755
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -1,3 +1,3 @@
 require("options")
 require("keybinds")
-require("lazy-conf")
+require("lazy")
diff --git a/nvim/lua/lazy-conf.lua b/nvim/lua/lazy.lua
similarity index 58%
rename from nvim/lua/lazy-conf.lua
rename to nvim/lua/lazy.lua
index c535aef..97b2a7d 100755
--- a/nvim/lua/lazy-conf.lua
+++ b/nvim/lua/lazy.lua
@@ -1,13 +1,23 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-    vim.fn.system({
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+    local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+    local out = vim.fn.system({
         "git",
         "clone",
         "--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
         "--branch=stable", -- latest stable release
+        lazyrepo,
         lazypath,
     })
+    if vim.v.shell_error ~= 0 then
+        vim.api.nvim_echo({
+            { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+            { out,                            "WarningMsg" },
+            { "\nPress any key to exit..." },
+        }, true, {})
+        vim.fn.getchar()
+        os.exit(1)
+    end
 end
 vim.opt.rtp:prepend(lazypath)