Bugfix: NPE under some circumstances in NotifUtil