fix error reporting from c3
+ minor generic fixes
Merge remote-tracking branch 'upstream/master' into upstream
Merge pull request #226 from tiger-seo/upstream

fix error reporting from c3