From 30e8a55ef606fe4ae2c43ae56adc125eb5370717 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 2 Mar 2022 18:34:43 +0100
Subject: [PATCH] Catch NPE when fetching non-certificate data

---
 wkd-java-cli/src/main/java/pgp/wkd/cli/command/Fetch.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wkd-java-cli/src/main/java/pgp/wkd/cli/command/Fetch.java b/wkd-java-cli/src/main/java/pgp/wkd/cli/command/Fetch.java
index 1c919a2..34a46cd 100644
--- a/wkd-java-cli/src/main/java/pgp/wkd/cli/command/Fetch.java
+++ b/wkd-java-cli/src/main/java/pgp/wkd/cli/command/Fetch.java
@@ -56,6 +56,9 @@ public class Fetch implements Runnable {
         WKDAddress address = WKDAddress.fromEmail(email);
         try (InputStream inputStream = fetcher.fetch(address)) {
             PGPPublicKeyRing cert = PGPainless.readKeyRing().publicKeyRing(inputStream);
+            if (cert == null) {
+                throw new CertNotFetchableException("Fetched data does not contain an OpenPGP certificate.");
+            }
             KeyRingInfo info = PGPainless.inspectKeyRing(cert);
 
             List<String> userIds = info.getValidAndExpiredUserIds();