diff --git a/src/node/db/GroupManager.js b/src/node/db/GroupManager.js
index 82c14c39d..44bda74f2 100644
--- a/src/node/db/GroupManager.js
+++ b/src/node/db/GroupManager.js
@@ -213,7 +213,19 @@ exports.createGroupIfNotExistsFor = function(groupMapper, callback)
   //try to get a group for this mapper
   db.get("mapper2group:"+groupMapper, function(err, groupID)
   {
-     if(ERR(err, callback)) return;
+    function createGroupForMapper(cb) {
+      exports.createGroup(function(err, responseObj)
+      {
+        if(ERR(err, cb)) return;
+        
+        //create the mapper entry for this group
+        db.set("mapper2group:"+groupMapper, responseObj.groupID);
+        
+        cb(null, responseObj);
+      });
+    }
+
+    if(ERR(err, callback)) return;
      
      // there is a group for this mapper
      if(groupID) {
@@ -229,18 +241,6 @@ exports.createGroupIfNotExistsFor = function(groupMapper, callback)
      else {
        createGroupForMapper(callback)
      }
-     
-     function createGroupForMapper(cb) {
-       exports.createGroup(function(err, responseObj)
-       {
-         if(ERR(err, cb)) return;
-         
-         //create the mapper entry for this group
-         db.set("mapper2group:"+groupMapper, responseObj.groupID);
-         
-         cb(null, responseObj);
-       });
-     }
   });
 }