Add null safty check
Added number formatter that has a null value.