HandleControlFailure added as part of this commit