Empty strings should be null