From d5c78b814875ca5298a664314591ecb644a23741 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 1 Dec 2020 18:05:03 -0500
Subject: [PATCH] avoid NPE when calling superclass validate

---
 .../validation/EntityConfigFieldValidator_json.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/validation/EntityConfigFieldValidator_json.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/validation/EntityConfigFieldValidator_json.java
index 5f3b319..6765285 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/validation/EntityConfigFieldValidator_json.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/validation/EntityConfigFieldValidator_json.java
@@ -15,8 +15,8 @@ public class EntityConfigFieldValidator_json extends EntityConfigFieldValidator_
 
     @Override public ValidationResult validate(Locale locale, Validator validator, EntityFieldConfig fieldConfig,
                                                Object value) {
-        ValidationResult validation = super.validate(locale, validator, fieldConfig, value);
-        if (validation.isInvalid()) return validation;
+        final ValidationResult validation = super.validate(locale, validator, fieldConfig, value);
+        if (validation != null && validation.isInvalid()) return validation;
         final String val = empty(value) ? "" : value.toString().trim();
         if (empty(val)) return fieldConfig.required() ? new ValidationResult("err."+fieldConfig.getName()+".required") : null;
         try {