fix null string issue