Routing Updated with proper error Handling