Correctly remap failure cases when doing putdown