ENG-6375 Better failure handling when retrying.