Protect against harvesting failure
Merge pull request #4535 from bsunanda/Phase2-hcx8

Phase2-hcx8