let the location mapper retry when data location is not set first time
Merge pull request #5013 from ticoann/fix_location_none_case

let the location mapper retry when data location is not set first time