diff --git a/lib/HooksWorkerClient.js b/lib/HooksWorkerClient.js
index faaa25d81..c3fd8a9d2 100644
--- a/lib/HooksWorkerClient.js
+++ b/lib/HooksWorkerClient.js
@@ -40,7 +40,10 @@ class HooksWorkerClient {
 
         logger.debug('Connecting to hooks handler.');
         this.connectToHandler((connectHandlerError) => {
-          if (connectHandlerError) { return callback(connectHandlerError); }
+          if (connectHandlerError) {
+            this.terminateHandler(terminateError => callback(connectHandlerError || terminateError));
+            return;
+          }
 
           logger.debug('Registering hooks.');
           this.registerHooks((registerHooksError) => {