Added configuration option to allow disabling of the error catching
Merge pull request #1 from steroberts89/master

Added configuration option to allow disabling of the error catching