diff --git a/bin/cli-users b/bin/cli-users
index 96f004d4c..a7e9cdbda 100755
--- a/bin/cli-users
+++ b/bin/cli-users
@@ -89,6 +89,10 @@ function createUser(options) {
           .then(() => {
             console.log(`Added the admin ${result.role.trim()} to User ${user.id}.`);
             util.shutdown();
+          })
+          .catch((err) => {
+            console.error(err);
+            util.shutdown();
           });
       } else {
         util.shutdown();
diff --git a/services/users.js b/services/users.js
index 8f77fbea7..0bf22e9e0 100644
--- a/services/users.js
+++ b/services/users.js
@@ -490,7 +490,7 @@ module.exports = class UsersService {
    * @return {Promise}
    */
   static all() {
-    UserModel.find();
+    return UserModel.find();
   }
 
   /**