diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/ShibbolethPlaceholderTokenAwareValueResolvingService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/ShibbolethPlaceholderTokenAwareValueResolvingService.java
index baca61749..242027773 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/ShibbolethPlaceholderTokenAwareValueResolvingService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/ShibbolethPlaceholderTokenAwareValueResolvingService.java
@@ -29,7 +29,11 @@ public class ShibbolethPlaceholderTokenAwareValueResolvingService implements Tok
 
     @Override
     public String resolveValueFromTokenPlaceholder(String potentialTokenPlaceholder) {
-        requireNonNull(potentialTokenPlaceholder, "potentialTokenPlaceholder must not be null");
+        //Ignore nulls.
+        if(potentialTokenPlaceholder == null) {
+            return potentialTokenPlaceholder;
+        }
+
         if(potentialTokenPlaceholder.contains(SHIB_IDP_PLACEHOLDER_PREEFIX)) {
             String normalizedTokenPlaceholder =
                     potentialTokenPlaceholder.replace(SHIB_IDP_PLACEHOLDER_PREEFIX, STANDART_PLACEHOLDER_PREFIX);