diff --git a/avni-server-api/src/main/java/org/avni/server/service/FormService.java b/avni-server-api/src/main/java/org/avni/server/service/FormService.java index 3b3e9111c..8fb16049c 100644 --- a/avni-server-api/src/main/java/org/avni/server/service/FormService.java +++ b/avni-server-api/src/main/java/org/avni/server/service/FormService.java @@ -161,7 +161,8 @@ public void validateForm(FormContract formContract) throws InvalidObjectExceptio formContract.getUuid(), conceptUuid)); } - if (multiSelectTypes.contains(ConceptDataType.valueOf(formElement.getConcept().getDataType()))) { + String conceptDataType = formElement.getConcept().getDataType(); + if (conceptDataType != null && multiSelectTypes.contains(ConceptDataType.valueOf(conceptDataType))) { FormElement existingFormElement = formElementRepository.findByUuid(formElement.getUuid()); if (existingFormElement != null) { if (!existingFormElement.getType().equals(formElement.getType())) {