diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py
index f13ea311..7bf5f436 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -235,7 +235,9 @@ class DownloadUtils(object):
 
             if requires_server and (not server or not server.get("Server") or not server.get("UserId")):
                 #xbmcgui.Dialog().ok('Emby for Kodi', "You are not connected to your emby server.")
-                raise Exception("Aborting download, Server Details Error: %s url=%s" % (server, url))
+                #raise Exception("Aborting download, Server Details Error: %s url=%s" % (server, url))
+                log.error("Aborting download, Server Details Error: %s url=%s", server, url)
+                return
 
             if server_id is None and self.session_requests is not None: # Main server
                 session = self.session_requests
diff --git a/resources/lib/entrypoint.py b/resources/lib/entrypoint.py
index 3e051073..cfcbd4c0 100644
--- a/resources/lib/entrypoint.py
+++ b/resources/lib/entrypoint.py
@@ -44,6 +44,9 @@ XML_PATH = (addon.getAddonInfo('path'), "default", "1080i")
 
 def doPlayback(itemId, dbId):
 
+    if window('emby_online') != "true":
+        return
+
     emby = embyserver.Read_EmbyServer()
     item = emby.getItem(itemId)
     pbutils.PlaybackUtils(item).play(itemId, dbId)