diff --git a/src/groups/membership.js b/src/groups/membership.js
index b570d1fbe7..3e18979f96 100644
--- a/src/groups/membership.js
+++ b/src/groups/membership.js
@@ -153,11 +153,7 @@ module.exports = function(Groups) {
 				path: '/groups/' + utils.slugify(groupName)
 			}),
 			function (notification, next) {
-				if (!notification) {
-					return next();
-				}
-
-				notifications.push(notification, [uid]);
+				notifications.push(notification, [uid], next);
 			}
 		], callback);
 	};
diff --git a/src/notifications.js b/src/notifications.js
index f95eb52248..1d466f374b 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -163,7 +163,7 @@ var utils = require('../public/src/utils');
 	Notifications.push = function(notification, uids, callback) {
 		callback = callback || function() {};
 
-		if (!notification.nid) {
+		if (!notification || !notification.nid) {
 			return callback();
 		}