-Added tests to validate error routing.
-Fixed issue with error routing found with tests.