diff --git a/beat/core/scripts/worker.py b/beat/core/scripts/worker.py
index f2b1656d1a4b8b1fa288007e02b7f5d80b89c62f..277f8bd3d1a0873c3de6d8aa291c1494125470c8 100755
--- a/beat/core/scripts/worker.py
+++ b/beat/core/scripts/worker.py
@@ -153,7 +153,7 @@ def main(user_input=None):
     handler = logging.StreamHandler()
     handler.setFormatter(formatter)
 
-    logger = logging.getLogger(__name__)
+    logger = logging.getLogger('beat.core')
     logger.addHandler(handler)
 
     if args['--verbose'] == 1:
@@ -163,6 +163,8 @@ def main(user_input=None):
     else:
         logger.setLevel(logging.WARNING)
 
+    logger = logging.getLogger(__name__)
+
 
     # Check the prefix path
     prefix = args['--prefix'] if args['--prefix'] is not None else '.'
@@ -196,6 +198,7 @@ def main(user_input=None):
     docker_images_cache = None
     if args['--docker']:
         docker_images_cache = os.path.join(tempfile.gettempdir(), 'beat-docker-images.json')
+        logger.info("Using docker images cache: '%s'", docker_images_cache)
         host = Host(images_cache=docker_images_cache, raise_on_errors=False)
 
 
@@ -234,7 +237,8 @@ def main(user_input=None):
 
         break
 
-    logger.info("The scheduler answered")
+    if not stop:
+        logger.info("The scheduler answered")
 
 
     # Process the requests