diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/PropertyDefinitionFieldSetPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/PropertyDefinitionFieldSetPersist.java
index d313917ff..1799ff4f9 100644
--- a/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/PropertyDefinitionFieldSetPersist.java
+++ b/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/PropertyDefinitionFieldSetPersist.java
@@ -54,8 +54,8 @@ public class PropertyDefinitionFieldSetPersist {
 
         @Override
         protected List<Specification> specifications(PropertyDefinitionFieldSetPersist item) {
-            int min = fieldSetEntity != null && fieldSetEntity.getHasMultiplicity() && fieldSetEntity.getMultiplicity() != null ? fieldSetEntity.getMultiplicity().getMin() : 0;
-            int max = fieldSetEntity != null && fieldSetEntity.getHasMultiplicity()  && fieldSetEntity.getMultiplicity() != null ? fieldSetEntity.getMultiplicity().getMax() : Integer.MAX_VALUE;
+            int min = fieldSetEntity != null && fieldSetEntity.getHasMultiplicity() && fieldSetEntity.getMultiplicity() != null && fieldSetEntity.getMultiplicity().getMin() != null ? fieldSetEntity.getMultiplicity().getMin() : 0;
+            int max = fieldSetEntity != null && fieldSetEntity.getHasMultiplicity()  && fieldSetEntity.getMultiplicity() != null && fieldSetEntity.getMultiplicity().getMax() != null ? fieldSetEntity.getMultiplicity().getMax() : Integer.MAX_VALUE;
 
             return Arrays.asList(
                     this.navSpec()