Created small fixes for error routings