fix not empty, form-error improvement