Convert empty strings to nulls