diff --git a/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java b/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
index 705fb8b6eb04da7ee7eccb64a52455c4a560b3e3..f38ba5f8ba8091780313bade25e2d6af1981a4bd 100644
--- a/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
+++ b/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/JWKGenerator.java
@@ -34,7 +34,7 @@ import java.util.UUID;
 /**
  * JWK Test Key Generator.
  * <p>
- * Generates public and private keys for encryption and signing with.
+ * Generates key pairs of public and private keys for encryption and signing.
  */
 public class JWKGenerator {
 
diff --git a/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/KeyWriter.java b/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/KeyWriter.java
index 687518b32f92ec499302832af4312ac5eeaa7fa6..84fca07628638ef5a1ab7e1ac1fbc152797cad44 100644
--- a/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/KeyWriter.java
+++ b/cli/src/main/java/dev/fitko/fitconnect/cli/keygen/KeyWriter.java
@@ -99,7 +99,7 @@ public final class KeyWriter {
             Files.write(path, content.getBytes(StandardCharsets.UTF_8));
         } catch (final IOException e) {
             LOGGER.error(e.getMessage(), e);
-            throw new RuntimeException(e);
+            System.exit(0);
         }
     }
 }