Minor fix to the handling of null strings.