diff --git a/src/user.js b/src/user.js
index e5b270add8..9a8251d6ee 100644
--- a/src/user.js
+++ b/src/user.js
@@ -298,7 +298,7 @@ User.getModeratorUids = function (callback) {
 			}, { working: [], regular: [] });
 
 			groups.getMembersOfGroups(sets.working, function (err, memberSets) {
-				next(null, sets.regular.concat(memberSets));
+				next(err, sets.regular.concat(memberSets || []));
 			});
 		},
 		function (memberSets, next) {
diff --git a/test/user.js b/test/user.js
index 4c6647c8fd..a7204b01ca 100644
--- a/test/user.js
+++ b/test/user.js
@@ -164,7 +164,7 @@ describe('User', function () {
 			User.getModeratorUids(function (err, uids) {
 				assert.ifError(err);
 				assert.strictEqual(1, uids.length);
-				assert.strictEqual(1, parseInt(uids[0]));
+				assert.strictEqual(1, parseInt(uids[0], 10));
 				done();
 			});
 		});
@@ -187,7 +187,7 @@ describe('User', function () {
 			User.getModeratorUids(function (err, uids) {
 				assert.ifError(err);
 				assert.strictEqual(1, uids.length);
-				assert.strictEqual(1, parseInt(uids[0]));
+				assert.strictEqual(1, parseInt(uids[0], 10));
 				done();
 			});
 		});