#228 Don't blow away everything on failure