From d9125c215c51174ea9e224ba5bd46d6d50b8484f Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 23 Dec 2015 09:50:30 -0500
Subject: [PATCH] more notif crash fixes

---
 src/notifications.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/notifications.js b/src/notifications.js
index ecfbcbd569..b76863e7e5 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -396,7 +396,7 @@ var async = require('async'),
 
 				// Filter out duplicates
 				notifications = notifications.filter(function(notifObj, idx) {
-					if (!notifObj.mergeId) {
+					if (!notifObj || !notifObj.mergeId) {
 						return true;
 					}