diff --git a/src/main/java/org/tdl/vireo/utility/SubmissionHelperUtility.java b/src/main/java/org/tdl/vireo/utility/SubmissionHelperUtility.java
index 97f37f00f..877c2838b 100644
--- a/src/main/java/org/tdl/vireo/utility/SubmissionHelperUtility.java
+++ b/src/main/java/org/tdl/vireo/utility/SubmissionHelperUtility.java
@@ -661,15 +661,17 @@ public String getEmbargoLiftDate() {
             Optional<FieldValue> defaultEmbargo = getFirstFieldValueByPredicateValue("default_embargos");
 
             Optional<FieldValue> embargo = Optional.empty();
+
+            Boolean proquestEmbargoCheck = proquestEmbargo.isPresent() && proquestEmbargo.get().getIdentifier() != null && Integer.valueOf(proquestEmbargo.get().getIdentifier()) > 0;
+            Boolean defaultEmbargoCheck = defaultEmbargo.isPresent() && defaultEmbargo.get().getIdentifier() != null && Integer.valueOf(defaultEmbargo.get().getIdentifier()) > 0;
             
-            if (proquestEmbargo.isPresent() && Integer.valueOf(proquestEmbargo.get().getIdentifier()) > 0 &&
-                defaultEmbargo.isPresent() && Integer.valueOf(defaultEmbargo.get().getIdentifier()) > 0) {
+            if (proquestEmbargoCheck && defaultEmbargoCheck) {
                 embargo = Integer.valueOf(proquestEmbargo.get().getIdentifier()) >= Integer.valueOf(defaultEmbargo.get().getIdentifier())
                     ? proquestEmbargo
                     : defaultEmbargo;
-            } else if (proquestEmbargo.isPresent() && Integer.valueOf(proquestEmbargo.get().getIdentifier()) > 0) {
+            } else if (proquestEmbargoCheck) {
                 embargo = proquestEmbargo;
-            } else if (defaultEmbargo.isPresent() && Integer.valueOf(defaultEmbargo.get().getIdentifier()) > 0) {
+            } else if (defaultEmbargoCheck) {
                 embargo = defaultEmbargo;
             }