Don't continue if an error occurs
Merge pull request #1 from nickplee/patch-1

Don't continue if an error occurs