Better notification creation - removed possible NPE