diff --git a/Script/cs/Threads/ManagerThread.py b/Script/cs/Threads/ManagerThread.py
index 2081deb82b804e51ea2c1ceb0d935636549218d2..614e7d00aa3644fda112b86d143308c6fd806a02 100644
--- a/Script/cs/Threads/ManagerThread.py
+++ b/Script/cs/Threads/ManagerThread.py
@@ -113,7 +113,7 @@ class ManagerThread(threading.Thread):
                 fmd = self.clearqueue.get_nowait()
             except queue.Empty:
                 break
-            self.logger.debug('got file %s from queue', fmd.file_name)
+            self.logger.debug('got file from queue: %s', fmd.file_name)
 
             if self.exitevent.is_set(): break
 
@@ -135,6 +135,7 @@ class ManagerThread(threading.Thread):
         if len(newfiles) != 0:
             self.logger.info('found %d new files to handle', len(newfiles))
         for fmd in newfiles:
+            if self.exitevent.is_set(): return
             self.logger.info('new file to handle: %s', fmd.file_name)
             self.managedfiles.append(fmd.file_name)
             if self.conf.CopyEnabled: