Fix Error binding fillMap when value is null