Merge pull request #353 from alex/check-result-code

check the result here