Map crash fixed

Mostly MOSYNC-2884