merge

1 files changed, 2 insertions, 0 deletions

diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js
index 2ffea0d..70ca414 100644
--- a/server/lib/views/staff.js
+++ b/server/lib/views/staff.js
@@ -143,6 +143,7 @@ var staff = module.exports = {
     },
     
     ensureObjectsUsers: function(objects, next){
+			if (! objects) { return next () }
       var dedupe = {}, user_ids
       objects.forEach(function(obj){
         dedupe[ obj.user_id ] = dedupe[ obj.user_id ] || []
@@ -152,6 +153,7 @@ var staff = module.exports = {
       User.find({ _id: user_ids })
           .select(staff.fields.user)
           .exec(function (err, users) {
+        if (! users) { return next () }
         users.forEach(function(user){
           dedupe[user._id].forEach(function(obj){
             obj.user = user