Added route specific error handling