Fixed bug with null string value