diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/SopCLI.java b/sop-java-picocli/src/main/java/sop/cli/picocli/SopCLI.java
index 8eb18bf..5420dea 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/SopCLI.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/SopCLI.java
@@ -22,6 +22,7 @@ import sop.cli.picocli.commands.RevokeKeyCmd;
 import sop.cli.picocli.commands.SignCmd;
 import sop.cli.picocli.commands.VerifyCmd;
 import sop.cli.picocli.commands.VersionCmd;
+import sop.exception.SOPGPException;
 
 import java.util.List;
 import java.util.Locale;
@@ -30,7 +31,7 @@ import java.util.ResourceBundle;
 @CommandLine.Command(
         name = "sop",
         resourceBundle = "msg_sop",
-        exitCodeOnInvalidInput = 69,
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedSubcommand.EXIT_CODE,
         subcommands = {
                 // Meta Subcommands
                 VersionCmd.class,
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/EncryptCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/EncryptCmd.java
index 079f9d8..efda26f 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/EncryptCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/EncryptCmd.java
@@ -18,7 +18,7 @@ import java.util.List;
 
 @CommandLine.Command(name = "encrypt",
         resourceBundle = "msg_encrypt",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class EncryptCmd extends AbstractSopCmd {
 
     @CommandLine.Option(names = "--no-armor",
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/ExtractCertCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/ExtractCertCmd.java
index 28a74b0..64a7a84 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/ExtractCertCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/ExtractCertCmd.java
@@ -14,7 +14,7 @@ import sop.operation.ExtractCert;
 
 @CommandLine.Command(name = "extract-cert",
         resourceBundle = "msg_extract-cert",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class ExtractCertCmd extends AbstractSopCmd {
 
     @CommandLine.Option(names = "--no-armor",
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/GenerateKeyCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/GenerateKeyCmd.java
index a41f086..eea992e 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/GenerateKeyCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/GenerateKeyCmd.java
@@ -16,7 +16,7 @@ import java.util.List;
 
 @CommandLine.Command(name = "generate-key",
         resourceBundle = "msg_generate-key",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class GenerateKeyCmd extends AbstractSopCmd {
 
     @CommandLine.Option(names = "--no-armor",
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/InlineSignCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/InlineSignCmd.java
index 773e6af..1865bcf 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/InlineSignCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/InlineSignCmd.java
@@ -18,7 +18,7 @@ import java.util.List;
 
 @CommandLine.Command(name = "inline-sign",
         resourceBundle = "msg_inline-sign",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class InlineSignCmd extends AbstractSopCmd {
 
     @CommandLine.Option(names = "--no-armor",
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/InlineVerifyCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/InlineVerifyCmd.java
index c3b73c5..c413c85 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/InlineVerifyCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/InlineVerifyCmd.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 @CommandLine.Command(name = "inline-verify",
         resourceBundle = "msg_inline-verify",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class InlineVerifyCmd extends AbstractSopCmd {
 
     @CommandLine.Parameters(arity = "0..*",
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/ListProfilesCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/ListProfilesCmd.java
index 46464f8..53ec024 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/ListProfilesCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/ListProfilesCmd.java
@@ -13,7 +13,7 @@ import sop.operation.ListProfiles;
 
 @CommandLine.Command(name = "list-profiles",
         resourceBundle = "msg_list-profiles",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class ListProfilesCmd extends AbstractSopCmd {
 
     @CommandLine.Parameters(paramLabel = "COMMAND", arity = "1", descriptionKey = "subcommand")
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/RevokeKeyCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/RevokeKeyCmd.java
index 28d1890..45f22fa 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/RevokeKeyCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/RevokeKeyCmd.java
@@ -14,7 +14,7 @@ import java.io.IOException;
 
 @CommandLine.Command(name = "revoke-key",
         resourceBundle = "msg_revoke-key",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class RevokeKeyCmd extends AbstractSopCmd {
 
     @CommandLine.Option(names = "--no-armor",
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/SignCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/SignCmd.java
index 521262b..cad9d6e 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/SignCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/SignCmd.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 @CommandLine.Command(name = "sign",
         resourceBundle = "msg_detached-sign",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class SignCmd extends AbstractSopCmd {
 
     @CommandLine.Option(names = "--no-armor",
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/VerifyCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/VerifyCmd.java
index 1bcd0a3..d76bb37 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/VerifyCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/VerifyCmd.java
@@ -18,7 +18,7 @@ import java.util.List;
 
 @CommandLine.Command(name = "verify",
         resourceBundle = "msg_detached-verify",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class VerifyCmd extends AbstractSopCmd {
 
     @CommandLine.Parameters(index = "0",
diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/VersionCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/VersionCmd.java
index c11d050..6ccb8f7 100644
--- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/VersionCmd.java
+++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/VersionCmd.java
@@ -7,10 +7,11 @@ package sop.cli.picocli.commands;
 import picocli.CommandLine;
 import sop.cli.picocli.Print;
 import sop.cli.picocli.SopCLI;
+import sop.exception.SOPGPException;
 import sop.operation.Version;
 
 @CommandLine.Command(name = "version", resourceBundle = "msg_version",
-        exitCodeOnInvalidInput = 37)
+        exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
 public class VersionCmd extends AbstractSopCmd {
 
     @CommandLine.ArgGroup()