Improve handling of error conditions in notification methods.