Merge pull request #53 from scan/master

Replace trigger_error With Exceptions For Easier Recovery