From 1f34e043ecb1d034ec51aa3c3f4c5c105f359e86 Mon Sep 17 00:00:00 2001
From: sfaulds <sfaulds@connexity.com>
Date: Wed, 11 Jan 2017 13:14:55 +1100
Subject: [PATCH] abort download if server is not set correctly.

---
 resources/lib/downloadutils.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py
index e5cb5a1b..bf6c9a72 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -216,6 +216,10 @@ class DownloadUtils(object):
             self._ensure_server(server_id)
             server = self.session if server_id is None else self.servers[server_id]
 
+            if server is None or server.get("Server", None) is None or server.get("UserId", None) is None:
+                log.info("Aborting download, Server Details Error: %s", server)
+                return None
+
             if server_id is None and self.session_requests is not None: # Main server
                 session = self.session_requests
             else: