From 9f5815555a6f6a44ab2aeee0e19558ae2dc88690 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 16 Dec 2015 13:56:12 -0500
Subject: [PATCH] fixed null error with notif grouping

---
 src/notifications.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/notifications.js b/src/notifications.js
index c09f438fc9..cda7fae2fd 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -344,6 +344,10 @@ var async = require('async'),
 
 		notifications = mergeIds.reduce(function(notifications, mergeId) {
 			isolated = notifications.filter(function(notifObj) {
+				if (!notifObj.hasOwnProperty('mergeId')) {
+					return false;
+				}
+
 				return notifObj.mergeId.split('|')[0] === mergeId;
 			});