diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
index ba03b3a9c4..172697ee59 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
@@ -196,9 +196,9 @@ public class TransportConnection implements Connection, Task, CommandVisitor {
         if (!stopping.get()) {
             transportException.set(e);
             if (TRANSPORTLOG.isDebugEnabled()) {
-                TRANSPORTLOG.debug("Transport failed: " + e, e);
+                TRANSPORTLOG.debug(this + " failed: " + e, e);
             } else if (TRANSPORTLOG.isWarnEnabled() && !expected(e)) {
-                TRANSPORTLOG.warn("Transport failed: " + e);
+                TRANSPORTLOG.warn(this + " failed: " + e);
             }
             stopAsync();
         }
@@ -1256,7 +1256,7 @@ public class TransportConnection implements Connection, Task, CommandVisitor {
         return null;
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private HashMap<String, String> createMap(Properties properties) {
         return new HashMap(properties);
     }
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
index 59e3841c08..7ce6ebdf64 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * @org.apache.xbean.XBean
- * 
+ *
  */
 public class TransportConnector implements Connector, BrokerServiceAware {
 
@@ -130,7 +130,7 @@ public class TransportConnector implements Connector, BrokerServiceAware {
     }
 
     /**
-     * 
+     *
      * @deprecated use the {@link #setBrokerService(BrokerService)} method
      *             instead.
      */
@@ -168,7 +168,7 @@ public class TransportConnector implements Connector, BrokerServiceAware {
      * {@link TransportServer} configured via the
      * {@link #setServer(TransportServer)} method. This value is used to lazy
      * create a {@link TransportServer} instance
-     * 
+     *
      * @param uri
      */
     public void setUri(URI uri) {
@@ -218,8 +218,9 @@ public class TransportConnector implements Connector, BrokerServiceAware {
                                 Connection connection = createConnection(transport);
                                 connection.start();
                             } catch (Exception e) {
+                                String remoteHost = transport.getRemoteAddress();
                                 ServiceSupport.dispose(transport);
-                                onAcceptError(e);
+                                onAcceptError(e, remoteHost);
                             }
                         }
                     });
@@ -526,7 +527,7 @@ public class TransportConnector implements Connector, BrokerServiceAware {
     public void setRebalanceClusterClients(boolean rebalanceClusterClients) {
         this.rebalanceClusterClients = rebalanceClusterClients;
     }
- 
+
     /**
      * @return the updateClusterClientsOnRemove
      */
@@ -540,7 +541,7 @@ public class TransportConnector implements Connector, BrokerServiceAware {
     public void setUpdateClusterClientsOnRemove(boolean updateClusterClientsOnRemove) {
         this.updateClusterClientsOnRemove = updateClusterClientsOnRemove;
     }
-    
+
     /**
      * @return the updateClusterFilter
      */
@@ -572,4 +573,4 @@ public class TransportConnector implements Connector, BrokerServiceAware {
     public void setAuditNetworkProducers(boolean auditNetworkProducers) {
         this.auditNetworkProducers = auditNetworkProducers;
     }
-}
\ No newline at end of file
+}