Fixing null refs due to notifications