Replaced null by ''