Fixed issue where null value would be set into the customdata values