Added handling for re-run errors