Improve errors and re-route success page