diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
index 08a8ff8377..7851c9a277 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
@@ -47,13 +47,18 @@ public class JChannelWrapper {
       this.manager = manager;
 
 
-      if (channel.getReceiver() != null) {
-         logger.warn("The channel already had a receiver previously!!!!", new Exception("trace"));
+      if (isTrace && channel.getReceiver() != null) {
+         logger.trace(this + "The channel already had a receiver previously!!!! == " + channel.getReceiver(), new Exception("trace"));
       }
 
       //we always add this for the first ref count
       channel.setReceiver(new ReceiverAdapter() {
 
+         @Override
+         public String toString() {
+            return "ReceiverAdapter::" + JChannelWrapper.this;
+         }
+
          @Override
          public void receive(org.jgroups.Message msg) {
             if (isTrace) {
@@ -85,8 +90,8 @@ public class JChannelWrapper {
             channel.setReceiver(null);
             logger.trace(this + "::Closing Channel: " + channelName, new Exception("Trace"));
             channel.close();
+            manager.removeChannel(channelName);
          }
-         manager.removeChannel(channelName);
       }
    }
 
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
index 3cd5bfd02f..c5b985133d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
@@ -637,7 +637,7 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
       Journal journalToUse = getJournal(packet.getJournalID());
       if (packet.getRecord() == ADD_OPERATION_TYPE.UPDATE) {
          if (isTrace) {
-           logger.trace("Endpoint appendUpdate id = " + packet.getId());
+            logger.trace("Endpoint appendUpdate id = " + packet.getId());
          }
          journalToUse.appendUpdateRecord(packet.getId(), packet.getJournalRecordType(), packet.getRecordData(), noSync);
       }