diff --git a/lib/adba/aniDBlink.py b/lib/adba/aniDBlink.py
index 9d8d9f6f..137698f5 100644
--- a/lib/adba/aniDBlink.py
+++ b/lib/adba/aniDBlink.py
@@ -64,7 +64,7 @@ class AniDBLink(threading.Thread):
                 self.myport = port
                 return True
         else:
-            return False;
+            return False
 
     def disconnectSocket(self):
         self.sock.close()
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index b589e4db..8568b136 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -1258,8 +1258,7 @@ def halt():
                 pass
 
             if ADBA_CONNECTION:
-                ADBA_CONNECTION.logout()
-                # ADBA_CONNECTION.stop()
+                ADBA_CONNECTION.logout(True)
                 logger.log(u"Waiting for the ANIDB CONNECTION thread to exit")
                 try:
                     ADBA_CONNECTION.join()
diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index 60825de8..1eb9ef8a 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -123,6 +123,7 @@ class DailySearchQueueItem(generic_queue.QueueItem):
             generic_queue.QueueItem.finish(self)
         except Exception:
             logger.log(traceback.format_exc(), logger.DEBUG)
+            threading.currentThread().name = self.name
 
         self.finish()
 
@@ -162,6 +163,7 @@ class ManualSearchQueueItem(generic_queue.QueueItem):
 
         except Exception:
             logger.log(traceback.format_exc(), logger.DEBUG)
+            threading.currentThread().name = self.name
 
         self.finish()
 
@@ -211,6 +213,7 @@ class BacklogQueueItem(generic_queue.QueueItem):
                     logger.log(u"No needed episodes found during backlog search for [" + self.show.name + "]")
         except Exception:
             logger.log(traceback.format_exc(), logger.DEBUG)
+            threading.currentThread().name = self.name
 
         self.finish()
 
@@ -259,5 +262,6 @@ class FailedQueueItem(generic_queue.QueueItem):
                         logger.log(u"No valid episode found to retry for [" + epObj.prettyName() + "]")
         except Exception:
             logger.log(traceback.format_exc(), logger.DEBUG)
+            threading.currentThread().name = self.name
 
         self.finish()
\ No newline at end of file