Eng 5597

ENG-5597 just do sanity checks.