Handle null string
0.3.7