return on error
Merge pull request #88 from joshwnj/master

Return on error