Fix Routing Exceptions