Fix null value conversion