Add better error handling for route mapping issues