From a6e5ca898f6825341afd2acc43f5162c08f3b41a Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 24 Jun 2021 15:07:41 +0200
Subject: [PATCH] Fix NPEs in KeyRingInfo.getExpirationDateForUse()

---
 .../java/org/pgpainless/key/info/KeyRingInfo.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
index 899569cb..3dc75c6f 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
@@ -660,12 +660,16 @@ public class KeyRingInfo {
         }
 
         if (nonExpiringSubkeys.isEmpty()) {
-            if (latestSubkeyExpirationDate.before(primaryExpiration)) {
-                return latestSubkeyExpirationDate;
+            if (latestSubkeyExpirationDate != null) {
+                if (primaryExpiration == null) {
+                    return latestSubkeyExpirationDate;
+                }
+                if (latestSubkeyExpirationDate.before(primaryExpiration)) {
+                    return latestSubkeyExpirationDate;
+                }
             }
-            return primaryExpiration;
         }
-        return null;
+        return primaryExpiration;
     }
 
     /**