From 684c24cbaf66320b30abad46e3c4a9ec145ad5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Thu, 21 Jul 2016 17:00:06 +0200
Subject: [PATCH] Handle case where activity cannot be found.

---
 pillar/application/utils/activities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pillar/application/utils/activities.py b/pillar/application/utils/activities.py
index 0136cf50..9c53de62 100644
--- a/pillar/application/utils/activities.py
+++ b/pillar/application/utils/activities.py
@@ -12,7 +12,7 @@ def notification_parse(notification):
     nodes_collection = current_app.data.driver.db['nodes']
     activity = activities_collection.find_one({'_id': notification['activity']})
 
-    if activity['object_type'] != 'node':
+    if activity is None or activity['object_type'] != 'node':
         return
     node = nodes_collection.find_one({'_id': activity['object']})
     # Initial support only for node_type comments