1 files changed, 5 insertions, 12 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/utils/AssertionAttributeExtractor.java b/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/utils/AssertionAttributeExtractor.java
index 4d8c8993..71421aae 100644
--- a/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/utils/AssertionAttributeExtractor.java
+++ b/eaaf_modules/eaaf_module_pvp2_sp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/sp/impl/utils/AssertionAttributeExtractor.java
@@ -316,13 +316,8 @@ public class AssertionAttributeExtractor {
    * @return Date, when the SAML2 assertion was issued, otherwise null
    */
   public Instant getAssertionIssuingDate() {
-    try {
-      return getFullAssertion().getIssueInstant();
+    return getFullAssertion() != null ? getFullAssertion().getIssueInstant() : null;
 
-    } catch (final NullPointerException e) {
-      return null;
-
-    }
   }
 
   /**
@@ -335,13 +330,11 @@ public class AssertionAttributeExtractor {
    * @return Date, after this SAML2 assertion is valid, otherwise null
    */
   public Date getAssertionNotBefore() {
-    try {
-      return Date.from(getFullAssertion().getConditions().getNotBefore());
+    return getFullAssertion() != null && getFullAssertion().getConditions() != null
+        && getFullAssertion().getConditions().getNotBefore() != null
+        ? Date.from(getFullAssertion().getConditions().getNotBefore())
+        : null;
 
-    } catch (final NullPointerException e) {
-      return null;
-
-    }
   }
 
   private AuthnStatement getAuthnStatement() throws AssertionAttributeExtractorExeption {