From 905976a1b60cd5fa365fea364d758b6843d998d0 Mon Sep 17 00:00:00 2001
From: grez911 <grez911@gmail.com>
Date: Tue, 22 Aug 2017 17:43:55 +0300
Subject: [PATCH] Added exception handling for broken user.json

---
 src/Ui/UiRequest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py
index 97d0d25d..50acdff2 100644
--- a/src/Ui/UiRequest.py
+++ b/src/Ui/UiRequest.py
@@ -588,7 +588,11 @@ class UiRequest(object):
                     site = site_check
 
             if site:  # Correct wrapper key
-                user = self.getCurrentUser()
+                try:
+                    user = self.getCurrentUser()
+                except Exception, err:
+                    self.log.error("Error in data/user.json: %s" % err)
+                    return self.error500()
                 if not user:
                     self.log.error("No user found")
                     return self.error403()