fix nils in notifications