Fix the coverity issues

This PR is to resolve issues raised by coverity.

BUG=XWALK-2928
no "else" after "return"