2.3.1 - fixing bug where routing after an error has propogated all the way up was routing wrong