Fix handling of failures since we now have ReportPhase