Add subscriber error handling