diff --git a/server/cli/users.js b/server/cli/users.js
index e8c72f92..f060f494 100644
--- a/server/cli/users.js
+++ b/server/cli/users.js
@@ -1,6 +1,10 @@
 let db
 function _initializeDB () {
   const config = require('../config')
+  if (config.status !== 'CONFIGURED') {
+    console.error(`> Cannot run CLI before setup (are you in the correct path?)`)
+    process.exit(1)
+  }
   config.log_level = 'error'
   db = require('../api/models/index')
   return db.initialize()
diff --git a/server/config.js b/server/config.js
index 50ff6474..ebc3d631 100644
--- a/server/config.js
+++ b/server/config.js
@@ -44,7 +44,7 @@ let config = {
       }
     } else {
       config.status = 'SETUP'
-      console.info('> Configuration file does not exists, running setup..')
+      console.info('> Configuration file does not exists...')
     }
   }
 }