diff --git a/yubikey-ca-java/src/main/java/me/hatter/tools/yubikeyca/YubikeyCaArgsUtil.java b/yubikey-ca-java/src/main/java/me/hatter/tools/yubikeyca/YubikeyCaArgsUtil.java
index 9e7129c..80f2b78 100644
--- a/yubikey-ca-java/src/main/java/me/hatter/tools/yubikeyca/YubikeyCaArgsUtil.java
+++ b/yubikey-ca-java/src/main/java/me/hatter/tools/yubikeyca/YubikeyCaArgsUtil.java
@@ -23,11 +23,11 @@ public class YubikeyCaArgsUtil {
 
         if (cmd.isUsageHelpRequested()) {
             cmd.usage(cmd.getOut());
-            return null;
         } else if (cmd.isVersionHelpRequested()) {
             cmd.printVersionHelp(cmd.getOut());
-            return null;
+        } else {
+            return yubikeyCaArgs;
         }
-        return yubikeyCaArgs;
+        return null;
     }
 }