Added fixes for coverity issues 1150822, 1150821 and
1147706. TRQ-2424