Put back self._non_form_errors = self.error_class(), simplify code
Merge pull request #2 from diox/fix-forms-count-1.6

Put back self._non_form_errors = self.error_class(), simplify code