diff --git a/edsm-getnearest.py b/edsm-getnearest.py
index ed6d889..e2fb194 100755
--- a/edsm-getnearest.py
+++ b/edsm-getnearest.py
@@ -61,6 +61,9 @@ def outputGui():
     except (ServerError, NotFoundError) as e:
       lbl = tk.Label(frame, text=e)
       lbl.grid(row=0, columnspan=2)
+    except EdsmApiException as e:
+      lbl = tk.Label(frame, text=e)
+      lbl.grid(row=0, columnspan=2)
   window = tk.Tk()
   window.title('EDSM nearest CMDR')
   lbl = tk.Label(window, text='system:')
@@ -86,6 +89,9 @@ def outputText():
   except (ServerError, NotFoundError) as e:
     print(e)
     exit(1)
+  except EdsmApiException as e:
+    print(e)
+    exit(1)
   nearestCmdr = min(distances,key=distances.get)
   if shortOutput:
     print('nearest commander: {} ({} ly).'.format(nearestCmdr,
diff --git a/pyEDSM b/pyEDSM
index 13d766a..573c6c3 160000
--- a/pyEDSM
+++ b/pyEDSM
@@ -1 +1 @@
-Subproject commit 13d766a2b9305c009b985be6d79fac7fdb1bf960
+Subproject commit 573c6c322ff27e304fc2dd803f362156f8d45dbb