diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java
index d119cbe3aad..20ae5635247 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java
@@ -158,6 +158,7 @@ public class Replication implements WALActionsListener,
         this.replicationSink.stopReplicationSinkServices();
       }
     }
+    scheduleThreadPool.shutdown();
   }
 
   /**
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
index c86549027b9..c3f7f05ffcd 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
@@ -796,7 +796,7 @@ public class ReplicationSource extends Thread
           if (ex instanceof RemoteException) {
             ex = ((RemoteException) ex).unwrapRemoteException();
           }
-          LOG.info("Slave cluster looks down: " + ex.getMessage());
+          LOG.info("Slave cluster looks down: " + ex.getMessage(), ex);
         }
       }
     };