diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index 3a774e143e..f211027412 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -137,6 +137,9 @@ accountsController.getUserByUID = function(req, res, next) {
 	var uid = req.params.uid ? req.params.uid : 0;
 
 	user.getUserData(uid, function(err, userData) {
+		if (err) {
+			return next(err);
+		}
 		res.json(userData);
 	});
 };
diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index 9185e6e1aa..254845fe8f 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -5,11 +5,14 @@ var groups = require('../groups'),
 	nconf = require('nconf'),
 	groupsController = {};
 
-groupsController.list = function(req, res) {
+groupsController.list = function(req, res, next) {
 	groups.list({
 		truncateUserList: true,
 		expand: true
 	}, function(err, groups) {
+		if (err) {
+			return next(err);
+		}
 		res.render('groups/list', {
 			groups: groups
 		});