Add handling of failures on runner error