Index: hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java (revision 1463345) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/Replication.java (working copy) @@ -146,7 +146,9 @@ public void join() { if (this.replication) { this.replicationManager.join(); - this.replicationSink.stopReplicationSinkServices(); + if (this.replicationSink != null) { + this.replicationSink.stopReplicationSinkServices(); + } } }