Prevent subscribers unnecessarily entering failure state



<!---
@huboard:{"order":89.25,"milestone_order":45,"custom_state":""}
-->