Make safe against missing mapIndex