[mr2697] Fix possible BIH crash in unloading map. #1288