Do not repropagate a delivered=True notification
Fix ERROR state in task.py (was "failed")