Much better handling of the lack of mapping files