Fixed the null string problem