Missing change in routing and simplified exceptions