Set null values as null rather than empty string