TRQ-2691 - coverity issues

Fixed bugs for coverity issues 1216413, 1316401, and
1216412.