Changed exception handling to ensure only exceptions arising from missing map container are caught