Merge pull request #54 from WoogieNoogie/master

Revert error handling change