Merge branch 'BobCaSUaL-master'

toymachiner62 · Feb 1, 2016 · 13b5336 · 13b5336
2 parents 96ecc12 + 260ec94
commit 13b5336
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/acl.js b/lib/acl.js
@@ -89,7 +89,9 @@ exports.fetchEntity = function(query, param, request, cb) {
 	var def = Q.defer();
 	query(param, request, function(err, entity) {
 
-		if (err) {
+		if (err && err.isBoom) {
+			return def.reject(err);
+		} else if (err) {
 			return def.reject(Boom.badRequest('Bad Request', err));
 		}
 		else if (!entity) {