Repaired routing and error reporting.