diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd257fd..848e1df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,7 @@ SPDX-License-Identifier: CC0-1.0
 
 # Cert-D-PGPainless Changelog
 
-## 0.2.2
-- Bump `pgpainless-core` to `1.5.6`
-- Bump `cert-d-java` to `0.2.2`
-
-## 0.2.1
+# 0.2.1
 - Bump `pgpainless-core` to `1.3.12`
 
 ## 0.2.0
diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java
index 9e92e9f..5306d24 100644
--- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java
+++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java
@@ -4,6 +4,7 @@
 
 package pgp.cert_d.cli.commands;
 
+import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
 import org.pgpainless.PGPainless;
@@ -45,6 +46,9 @@ public class Import implements Runnable {
         } catch (BadDataException e) {
             LOGGER.error("Certificate contains bad data.", e);
             System.exit(-1);
+        } catch (PGPException e) {
+            LOGGER.error("PGP Exception.", e);
+            System.exit(-1);
         }
     }
 }
diff --git a/version.gradle b/version.gradle
index beeb5c3..2d7355f 100644
--- a/version.gradle
+++ b/version.gradle
@@ -4,16 +4,16 @@
 
 allprojects {
     ext {
-        shortVersion = '0.2.3'
-        isSnapshot = true
+        shortVersion = '0.2.1'
+        isSnapshot = false
         minAndroidSdk = 10
         javaSourceCompatibility = 1.8
         slf4jVersion = '1.7.36'
         logbackVersion = '1.2.11'
         junitVersion = '5.8.2'
         mockitoVersion = '4.5.1'
-        pgpainlessVersion = '1.5.6'
-        pgpCertDJavaVersion = '0.2.2'
+        pgpainlessVersion = '1.3.12'
+        pgpCertDJavaVersion = '0.2.1'
         picocliVersion = '4.6.3'
     }
 }