Better notification handling while delivering