Fixing routing error handling