avoid NPE during shutdown of replication, after a fix on replication
Merge pull request #1198 from clebertsuconic/master

avoid NPE during shutdown of replication, after a fix on replication