Improve notification delivery defensiveness