1 files changed, 6 insertions, 1 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index c0697f49..7b110c03 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -343,7 +343,12 @@ int certFlags_GmRequest(const iGmRequest *d) {
 
 iDate certExpirationDate_GmRequest(const iGmRequest *d) {
     iDate expiry;
-    validUntil_TlsCertificate(serverCertificate_TlsRequest(d->req), &expiry);
+    if (d->req) {
+        validUntil_TlsCertificate(serverCertificate_TlsRequest(d->req), &expiry);
+    }
+    else {
+        iZap(expiry);
+    }
     return expiry;
 }