diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index be558750a55d79ee059007faa5eb7f7b8bbe5400..824873576859214621b2c9b7792e943b30730e9d 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -14,6 +14,7 @@ use lib "/opt/testidp/IdPAccountManager/conf";
 
 use Getopt::Long qw(:config auto_help);
 use POSIX;
+use Pod::Usage;
 
 use IdPAccountManager::TestAccount;
 use IdPAccountManager::SAMLMetadata;
@@ -35,7 +36,10 @@ unless (
     )
   )
 {
-    die "Unknown options.";
+    pod2usage(
+        -message => "unknown option, aborting\n",
+        -verbose => 0
+    );
 }
 
 if ($options{'add_test_account'}) {
@@ -308,7 +312,10 @@ if ($options{'add_test_account'}) {
     printf "Mail notice sent to $options{'email_address'}\n";
 
 } else {
-    die "Missing arguments";
+    pod2usage(
+        -message => "missing argument, aborting\n",
+        -verbose => 0
+    );
 
 }