diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js
index d887143d89..2308892a42 100644
--- a/src/database/mongo/hash.js
+++ b/src/database/mongo/hash.js
@@ -32,7 +32,7 @@ module.exports = function(db, module) {
 
 	module.getObjects = function(keys, callback) {
 		if (!Array.isArray(keys) || !keys.length) {
-			return callback();
+			return callback(null, []);
 		}
 		db.collection('objects').find({_key: {$in: keys}}, {_id: 0}).toArray(function(err, data) {
 			if(err) {
diff --git a/src/notifications.js b/src/notifications.js
index 0e38a3eec7..3671ad1613 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -40,6 +40,10 @@ var async = require('async'),
 				return callback(err);
 			}
 
+			if (!Array.isArray(notifications) || !notifications.length) {
+				return callback(null, []);
+			}
+
 			async.map(notifications, function(notification, next) {
 				if (!notification) {
 					return next(null, null);