Rename last notification time; Add null check