Minor fix when value is null