* Fixed null reference exception when creating new map