diff --git a/sabnzbd/downloader.py b/sabnzbd/downloader.py
index 961c60c..65dc8c2 100644
--- a/sabnzbd/downloader.py
+++ b/sabnzbd/downloader.py
@@ -791,11 +791,8 @@ class Downloader(Thread):
                 # Remove this server from try_list
                 article.fetcher = None
 
-                nzf = article.nzf
-                nzo = nzf.nzo
-
-                # Allow all servers to iterate over each nzo/nzf again ##
-                sabnzbd.nzbqueue.NzbQueue.do.reset_try_lists(nzf, nzo)
+            # Allow all servers to iterate over each nzo/nzf again
+            sabnzbd.nzbqueue.NzbQueue.do.reset_try_lists(article.nzf, article.nzf.nzo)
 
         if destroy:
             nw.terminate(quit=quit)
diff --git a/sabnzbd/nzbqueue.py b/sabnzbd/nzbqueue.py
index e71831a..945e964 100644
--- a/sabnzbd/nzbqueue.py
+++ b/sabnzbd/nzbqueue.py
@@ -857,7 +857,9 @@ class NzbQueue(object):
         """ Detect jobs that have zero files left or are stalled
             and send them to post-processing
         """
-        nr_servers = len(sabnzbd.downloader.Downloader.do.servers)
+        # Only active servers that are not on time-out
+        nr_servers = len([server for server in sabnzbd.downloader.Downloader.do.servers if server.active])
+
         empty = []
         for nzo in self.__nzo_list:
             if not nzo.futuretype and nzo.status not in (Status.PAUSED, Status.GRABBING):