Deal w/ conditional failure

Not sure this is the right thing to do all the time, but in the grand
scheme of things it shouldn't result in many problems.