diff --git a/resources/lib/downloader.py b/resources/lib/downloader.py
index 02a41137..e6b4e16a 100644
--- a/resources/lib/downloader.py
+++ b/resources/lib/downloader.py
@@ -288,7 +288,9 @@ class TheVoid(object):
 
                 return response
 
-            if xbmc.Monitor().abortRequested():
+            if window('emby_should_stop.bool'):
+                LOG.info("Abandon mission! A black hole just swallowed [ %s ]", self.data['VoidName'])
+                
                 break
 
 def get_objects(src, filename):
diff --git a/resources/lib/entrypoint/default.py b/resources/lib/entrypoint/default.py
index f4ab6869..5e6d094f 100644
--- a/resources/lib/entrypoint/default.py
+++ b/resources/lib/entrypoint/default.py
@@ -215,6 +215,11 @@ def browse(media, view_id=None, folder=None, server_id=None):
     '''
     LOG.info("--[ v:%s/%s ] %s", view_id, media, folder)
 
+    if not window('emby_online.bool') and server_id is None:
+        LOG.error("Default server is not online.")
+
+        return
+
     if view_id:
 
         view = TheVoid('GetItem', {'ServerId': server_id, 'Id': view_id}).get()