More error checking, flipflop on redirect