diff --git a/src/Config.py b/src/Config.py
index 80a2f7a3..29cd4439 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -13,7 +13,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.7.0"
-        self.rev = 4001
+        self.rev = 4003
         self.argv = argv
         self.action = None
         self.pending_changes = {}
diff --git a/src/Worker/WorkerManager.py b/src/Worker/WorkerManager.py
index 24cb45c2..9d266d29 100644
--- a/src/Worker/WorkerManager.py
+++ b/src/Worker/WorkerManager.py
@@ -193,7 +193,7 @@ class WorkerManager(object):
             peers = list(peers)
 
         # Sort by ping
-        peers.sort(key=lambda peer: peer.connection.last_ping_delay if peer.connection and len(peer.connection.waiting_requests) == 0 and peer.connection.connected else 9999)
+        peers.sort(key=lambda peer: peer.connection.last_ping_delay if peer.connection and peer.connection.last_ping_delay and len(peer.connection.waiting_requests) == 0 and peer.connection.connected else 9999)
 
         for peer in peers:  # One worker for every peer
             if peers and peer not in peers: