diff --git a/addon.xml b/addon.xml
index ec17d9b5..1ca62726 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.17"
+        version="2.3.18"
         provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.19.0"/>
diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py
index 6a2acaf1..54c35ddf 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -225,18 +225,14 @@ class DownloadUtils(object):
                     'headers': self.get_header(server_id, authenticate)
                 })
 
-            if not server['Server'] or not server['UserId']:
-                log.error("Server or UserId not set, not logged in, returning None")
-                xbmcgui.Dialog().notification(heading=lang(29999),
-                                              message="Not Logged In",
-                                              icon=xbmcgui.NOTIFICATION_ERROR,
-                                              time=5000)
-                raise internal_exceptions.ExceptionWrapper("Not Logged In")
-
             # Replace for the real values
             url = url.replace("{server}", server['Server'])
             url = url.replace("{UserId}", server['UserId'])
 
+            # does the URL look ok
+            if url.startswith('/'):
+                raise internal_exceptions.ExceptionWrapper("URL Error: " + url)
+
             ##### PREPARE REQUEST #####
             kwargs.update({
                 'url': url,