basic error reporting
Merge branch 'jh/errorReporting'
Merge branch 'master' into generator-assets