diff --git a/src/controllers/admin.js b/src/controllers/admin.js
index 50c8deb009..926e30d7e1 100644
--- a/src/controllers/admin.js
+++ b/src/controllers/admin.js
@@ -389,9 +389,10 @@ adminController.groups.get = function(req, res, next) {
 		isAdmin: true,
 		showSystemGroups: true
 	}, function(err, groups) {
-		groups = groups.filter(function(group) {
-			return group.name !== 'registered-users' && group.name !== 'guests' && group.name.indexOf(':privileges:') === -1;
-		});
+		if (err) {
+			return next(err);
+		}
+
 		res.render('admin/manage/groups', {
 			groups: groups,
 			yourid: req.user.uid
diff --git a/src/groups.js b/src/groups.js
index 4f52d2bc9f..e12b09e66c 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -76,7 +76,10 @@ var async = require('async'),
 			if (err) {
 				return callback(err);
 			}
-			groupNames = groupNames.concat(ephemeralGroups);
+
+			groupNames = groupNames.filter(function(groupName) {
+				return groupName && groupName.indexOf(':privileges:') === -1 && groupName !== 'registered-users' && groupName !== 'guests';
+			});
 
 			async.parallel({
 				groups: async.apply(async.map, groupNames, function (groupName, next) {