Fixing first cherry-pick conflicts
Fixing incorrect else statement for logerror
Merge pull request #5821 from rappoccio/rappoccio_70x_jec_exception_fixes

Backporting 73x changes that suppress Exception in favor of LogError