made the map more robust for okapi errors