Merge pull request #974 from CAS-Atlantic/odin_coverity_CID203686

Odin coverity cid203686