Raise ItemNotFoundError rather than return None if no map found
Use a sort of name to choose if > 1 map
and some minor comment changes.