Fix the coverity issues

This PR is to resolve issues raised by coverity.

BUG=XWALK-2928
This message is unhelpful and could be removed.