Fixed null name issue