Fixed a bug where the error count woudl not be increments in one case.
Merge branch 'master' into gh-pages