basic error reporting
Merge branch 'jh/errorReporting'