diff --git a/beat/core/execution/docker.py b/beat/core/execution/docker.py
index 297a75cb4a2a859154089207427e39f866c53e9d..6cc3e701387d370f91fe8d1a10345cd23f1da054 100644
--- a/beat/core/execution/docker.py
+++ b/beat/core/execution/docker.py
@@ -47,8 +47,6 @@ import shutil
 import logging
 import requests
 import simplejson
-import zmq
-import docker
 
 from beat.backend.python.execution import MessageHandler
 
@@ -203,7 +201,7 @@ class DockerExecutor(RemoteExecutor):
         # Determine the docker image to use for the databases
         try:
             databases_environment = self.host.db2docker(database_paths.keys())
-        except:
+        except Exception:
             raise RuntimeError(
                 "No environment found for the databases `%s' "
                 "- available environments are %s"