return when error is occurs
Merge pull request #2 from sharkmandan/master

return when error is occurs