Added configuration option to allow disabling of the error catching