diff --git a/app/common/src/main/java/stirling/software/common/util/FormUtils.java b/app/common/src/main/java/stirling/software/common/util/FormUtils.java
index 2f6dbf1537..a1862d379c 100644
--- a/app/common/src/main/java/stirling/software/common/util/FormUtils.java
+++ b/app/common/src/main/java/stirling/software/common/util/FormUtils.java
@@ -968,7 +968,8 @@ public class FormUtils {
                 case PDPushButton ignored -> log.debug("Ignore Push button");
                 case PDSignatureField ignored ->
                         log.debug("Skipping signature field '{}'", field.getFullyQualifiedName());
-                case null, default -> field.setValue(value != null ? value : "");
+                case null -> log.warn("Attempted to set value on null field");
+                default -> field.setValue(value != null ? value : "");
             }
         } catch (Exception e) {
             log.warn(