diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua
index b79d2b6..8dcb155 100644
--- a/lua/cosmic/init.lua
+++ b/lua/cosmic/init.lua
@@ -4,7 +4,9 @@ local cosmic_modules = {
   'cosmic.pluginsInit',
   'cosmic.commands',
   'cosmic.editor',
+  'cosmic.config.editor',
   'cosmic.mappings',
+  'cosmic.config.mappings',
   'cosmic.core.theme.highlights',
 }
 
@@ -14,16 +16,7 @@ for _, mod in ipairs(cosmic_modules) do
     vim.notify('Run :PackerCompile!', vim.log.levels.WARN, {
       title = 'CosmicNvim',
     })
-  elseif not ok then
+  elseif not ok and not mod:find('cosmic.config') then
     error(('Error loading %s...\n\n%s'):format(mod, err))
   end
 end
-
-local user_config_modules = {
-  'cosmic.config.editor',
-  'cosmic.config.mappings',
-}
-
-for _, mod in ipairs(user_config_modules) do
-  pcall(require, mod)
-end