Correctly handle null in string