Improved handling of error or confirmation html page checks