Better whitebox failure recovery