Changes to routing in preparation for exception handling