made some changes on name is null or didnt give a new name