Minor change to try to (gracefully) fix redirect bugs.