diff --git a/src/main/java/apoc/broker/BrokerExceptionHandler.java b/src/main/java/apoc/broker/BrokerExceptionHandler.java
index 20475c46..fd506951 100644
--- a/src/main/java/apoc/broker/BrokerExceptionHandler.java
+++ b/src/main/java/apoc/broker/BrokerExceptionHandler.java
@@ -9,6 +9,9 @@
 import apoc.broker.exception.BrokerResendDisabledException;
 import apoc.broker.exception.BrokerRuntimeException;
 import apoc.broker.exception.BrokerSendException;
+
+import java.net.ConnectException;
+
 import org.neo4j.logging.Log;
 
 /**
@@ -189,14 +192,19 @@ public static BrokerConnectionRecoveryException brokerConnectionRecoveryExceptio
     public static BrokerConnectionInitializationException brokerConnectionInitializationException( String msg, Throwable e )
     {
         BrokerConnectionInitializationException brokerException;
-        if ( e != null )
+        if ( e == null )
         {
-            brokerException = new BrokerConnectionInitializationException( msg, e );
-            log.error( brokerException.getMessage(), e );
+            brokerException = new BrokerConnectionInitializationException( msg );
+            log.error( brokerException.getMessage() );
+        }
+        else if ( e instanceof ConnectException )
+        {
+            brokerException = new BrokerConnectionInitializationException( msg + " " + e );
+            log.warn( brokerException.getMessage() );
         }
         else
         {
-            brokerException = new BrokerConnectionInitializationException( msg );
+            brokerException = new BrokerConnectionInitializationException( msg, e );
             log.error( brokerException.getMessage() );
         }
 
diff --git a/src/main/java/apoc/broker/KafkaConnectionFactory.java b/src/main/java/apoc/broker/KafkaConnectionFactory.java
index 27036172..e90f2711 100644
--- a/src/main/java/apoc/broker/KafkaConnectionFactory.java
+++ b/src/main/java/apoc/broker/KafkaConnectionFactory.java
@@ -90,6 +90,7 @@ public KafkaConnection( Log log, String connectionName, Map<String,Object> confi
                 if ( verboseErrorLogging )
                 {
                     BrokerExceptionHandler.brokerConnectionInitializationException( "Failed to initialize Kafka connection '" + connectionName + "'.", e );
+                    log.warn( "APOC Broker: Initializing Kafka connection '" + connectionName + "' will be retried." );
                 }
                 connected.set( false );
             }
diff --git a/src/main/java/apoc/broker/RabbitMqConnectionFactory.java b/src/main/java/apoc/broker/RabbitMqConnectionFactory.java
index 8efdb7d8..8a3c941c 100644
--- a/src/main/java/apoc/broker/RabbitMqConnectionFactory.java
+++ b/src/main/java/apoc/broker/RabbitMqConnectionFactory.java
@@ -96,6 +96,7 @@ public RabbitMqConnection( Log log, String connectionName, Map<String,Object> co
                 if ( verboseErrorLogging )
                 {
                     BrokerExceptionHandler.brokerConnectionInitializationException( "Failed to initialize RabbitMQ connection '" + connectionName + "'.", e );
+                    log.warn( "APOC Broker: Initializing RabbitMQ connection '" + connectionName + "' will be retried." );
                 }
                 connected.set( false );
             }
diff --git a/src/main/java/apoc/broker/SqsConnectionFactory.java b/src/main/java/apoc/broker/SqsConnectionFactory.java
index f7253022..47c84749 100644
--- a/src/main/java/apoc/broker/SqsConnectionFactory.java
+++ b/src/main/java/apoc/broker/SqsConnectionFactory.java
@@ -71,6 +71,7 @@ public SqsConnection( Log log, String connectionName, Map<String,Object> configu
                 if ( verboseErrorLogging )
                 {
                     BrokerExceptionHandler.brokerConnectionInitializationException( "Failed to initialize SQS connection '" + connectionName + "'.", e );
+                    log.warn( "APOC Broker: Initializing SQS connection '" + connectionName + "' will be retried." );
                 }
                 connected.set( false );
             }