Updated the error handler routing