Basic error reporting setup
Merge branch 'error_reporting'