Changed routing error handling