From 499af034733ac34783ad621931c3a86ce2c65981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Tue, 1 Nov 2016 13:57:14 +0100
Subject: [PATCH] Gracefully handle 404 in get_user_info()

---
 pillar/web/subquery.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pillar/web/subquery.py b/pillar/web/subquery.py
index 6f133d84..bde086c5 100644
--- a/pillar/web/subquery.py
+++ b/pillar/web/subquery.py
@@ -5,6 +5,7 @@ to run in Flask Application context, it is manually applied in setup_app().
 """
 
 import pillarsdk
+import pillarsdk.exceptions
 from pillar.web.system_util import pillar_api
 
 
@@ -21,7 +22,11 @@ def get_user_info(user_id):
     if user_id is None:
         return {}
 
-    user = pillarsdk.User.find(user_id, api=pillar_api())
+    try:
+        user = pillarsdk.User.find(user_id, api=pillar_api())
+    except pillarsdk.exceptions.ResourceNotFound:
+        return {}
+
     if not user:
         return {}