diff --git a/addon.xml b/addon.xml
index af4d8732..059daa9b 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby"
         name="Emby" 
-        version="2.3.40"
+        version="2.3.41"
         provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.19.0"/>
diff --git a/resources/lib/connect/connectionmanager.py b/resources/lib/connect/connectionmanager.py
index 968c146d..b762a571 100644
--- a/resources/lib/connect/connectionmanager.py
+++ b/resources/lib/connect/connectionmanager.py
@@ -539,12 +539,12 @@ class ConnectionManager(object):
             log.info("skipping test at index: %s" % index)
             return self._testNextConnectionMode(tests, index+1, server, options)
 
-        log.info("testing connection mode %s with server %s" % (mode, server['Name']))
+        log.info("testing connection mode %s with server %s" % (mode, server.get('Name')))
         try:
             result = self._tryConnect(address, timeout, options)
         
         except Exception:
-            log.error("test failed for connection mode %s with server %s" % (mode, server['Name']))
+            log.error("test failed for connection mode %s with server %s" % (mode, server.get('Name')))
 
             if enableRetry:
                 # TODO: wake on lan and retry
@@ -561,7 +561,7 @@ class ConnectionManager(object):
                 }
             else:
                 log.info("calling onSuccessfulConnection with connection mode %s with server %s"
-                        % (mode, server['Name']))
+                        % (mode, server.get('Name')))
                 return self._onSuccessfulConnection(server, result, mode, options)
 
     def _onSuccessfulConnection(self, server, systemInfo, connectionMode, options):
diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py
index bf6c9a72..96ec40c7 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -217,8 +217,10 @@ class DownloadUtils(object):
             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
+                log.info("Aborting download, Server Details Error: %s url=%s" % (server, url))
+                exc = Exception("Aborting download, Server Details Error: %s url=%s" % (server, url))
+                #exc.quiet = True
+                raise exc
 
             if server_id is None and self.session_requests is not None: # Main server
                 session = self.session_requests
@@ -346,9 +348,6 @@ class DownloadUtils(object):
             log.error("unknown error connecting to: %s", url)
             raise
 
-        # something went wrong so return a None as we have no valid data
-        return None
-
     def _ensure_server(self, server_id=None):
 
         if server_id is None and self.session_requests is None: