From 5cbfa6f21284160c58448157064a310445ac9f33 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 25 Jul 2016 15:05:23 +0300
Subject: [PATCH] closes #4881

---
 src/groups/membership.js | 6 +-----
 src/notifications.js     | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/groups/membership.js b/src/groups/membership.js
index b570d1fbe7ab..3e18979f9622 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 f95eb52248b9..1d466f374b67 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();
 		}