Fix redirects causing multiple thread returns, locking thread.