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