1 files changed, 12 insertions, 9 deletions
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/MatchingTaskUtils.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/MatchingTaskUtils.java
index 3c9db9ea..c8a1f190 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/MatchingTaskUtils.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/MatchingTaskUtils.java
@@ -155,7 +155,7 @@ public class MatchingTaskUtils {
           result.put(el.getFriendlyName(), attribute);
           log.trace("Find attr '{}' with value: {}", el.getFriendlyName(), attribute);
         } else {
-          log.info("Ignore empty 'DateTime' attribute");
+          log.info("Ignore empty 'DateTime' attribute: {}", el.getNameUri());
         }
       } else if (PostalAddress.class.equals(parameterizedType)) {
         final PostalAddress addressAttribute = EidasResponseUtils
@@ -164,21 +164,24 @@ public class MatchingTaskUtils {
           result.put(el.getFriendlyName(), addressAttribute);
           log.trace("Find attr '{}' with value: {}", el.getFriendlyName(), addressAttribute);
         } else {
-          log.info("Ignore empty 'PostalAddress' attribute");
+          log.info("Ignore empty 'PostalAddress' attribute: {}", el.getNameUri());
         }
       } else {
         final List<String> natPersonIdObj = EidasResponseUtils.translateStringListAttribute(el, attributeMap.get(el));
-        final String stringAttr = natPersonIdObj.get(0);
-        if (StringUtils.isNotEmpty(stringAttr)) {
-          result.put(el.getFriendlyName(), stringAttr);
-          log.trace("Find attr '{}' with value: {}", el.getFriendlyName(), stringAttr);
+        if (natPersonIdObj.isEmpty() || StringUtils.isEmpty(natPersonIdObj.get(0))) {
+          log.info("Ignore empty 'String' attribute: {}", el.getNameUri());
+          
         } else {
-          log.info("Ignore empty 'String' attribute");
+          result.put(el.getFriendlyName(), natPersonIdObj.get(0));
+          log.trace("Find attr '{}' with value: {}", el.getFriendlyName(), natPersonIdObj.get(0));
+
         }
-      }
-    }
+      }      
+    }  
+    
     log.debug("Receive #{} attributes with names: {}", result.size(), result.keySet());
     return result;
+    
   }
 
   private MatchingTaskUtils() {