Improve handling for region not found