ENG-6344: update to use single error handling.