Change incorrect comment for error handler
Merge branch 'master' into template-error-handling