Fix de-serialize issues where setting value as null causes exception.