Fix bug 894551 - Add route error handlers