Fix recovery after move error