Update for handle null value