From bec58a5772fdb48f532b68c5d407916543f82644 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sun, 17 Nov 2019 17:29:16 +0300
Subject: [PATCH] Do not crash on cargo fetch failures

---
 service/port/shared.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/service/port/shared.py b/service/port/shared.py
index 214a7f3fe..5f3988723 100644
--- a/service/port/shared.py
+++ b/service/port/shared.py
@@ -82,9 +82,13 @@ def fetchItem(typeName, eagerCat=False):
     eager = 'group.category' if eagerCat else None
     try:
         item = sMkt.getItem(typeName, eager=eager)
+    except (KeyboardInterrupt, SystemExit):
+        raise
     except:
         pyfalog.warning('service.port.shared: unable to fetch item "{}"'.format(typeName))
         return None
+    if item is None:
+        return None
     if sMkt.getPublicityByItem(item):
         return item
     else: