Addressed Coverity issue 1197638
Addressed coverity issue 711901
Addressed Coverity issue 711896
Coverity issue 711880
Coverity 711880 Case #2