Improved handling if state is not known

A redirect to the original-uri, if it exists, resolves some of the
causes of this issue.