From c688c14d2c83965d92ff0fe5401d98d0526cfc03 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 12 Sep 2018 14:30:21 -0400
Subject: [PATCH] SHIBUI-836: wip

---
 ...hibbolethPlaceholderTokenAwareValueResolvingService.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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);