diff --git a/src/cli/Clip.cpp b/src/cli/Clip.cpp
index 106fed6cd..70d97c0e2 100644
--- a/src/cli/Clip.cpp
+++ b/src/cli/Clip.cpp
@@ -55,8 +55,7 @@ int Clip::execute(int argc, char** argv)
     const QStringList args = parser.positionalArguments();
     if (args.size() != 2) {
         QCoreApplication app(argc, argv);
-        parser.showHelp();
-        return EXIT_FAILURE;
+        parser.showHelp(EXIT_FAILURE);
     }
 
     Database* db = nullptr;
diff --git a/src/cli/Extract.cpp b/src/cli/Extract.cpp
index 36dde473b..b9433801c 100644
--- a/src/cli/Extract.cpp
+++ b/src/cli/Extract.cpp
@@ -44,8 +44,7 @@ int Extract::execute(int argc, char** argv)
 
     const QStringList args = parser.positionalArguments();
     if (args.size() != 1) {
-        parser.showHelp();
-        return EXIT_FAILURE;
+        parser.showHelp(EXIT_FAILURE);
     }
 
     out << "Insert the database password\n> ";
diff --git a/src/cli/List.cpp b/src/cli/List.cpp
index b0b791882..de6bd5ef5 100644
--- a/src/cli/List.cpp
+++ b/src/cli/List.cpp
@@ -62,8 +62,7 @@ int List::execute(int argc, char** argv)
     const QStringList args = parser.positionalArguments();
     if (args.size() != 1 && args.size() != 2) {
         QCoreApplication app(argc, argv);
-        parser.showHelp();
-        return EXIT_FAILURE;
+        parser.showHelp(EXIT_FAILURE);
     }
 
     Database* db = nullptr;
diff --git a/src/cli/Merge.cpp b/src/cli/Merge.cpp
index c69dcd604..a179d69be 100644
--- a/src/cli/Merge.cpp
+++ b/src/cli/Merge.cpp
@@ -61,8 +61,7 @@ int Merge::execute(int argc, char** argv)
     const QStringList args = parser.positionalArguments();
     if (args.size() != 2) {
         QCoreApplication app(argc, argv);
-        parser.showHelp();
-        return EXIT_FAILURE;
+        parser.showHelp(EXIT_FAILURE);
     }
 
     Database* db1;
diff --git a/src/cli/Show.cpp b/src/cli/Show.cpp
index 680f7a452..c212a9d61 100644
--- a/src/cli/Show.cpp
+++ b/src/cli/Show.cpp
@@ -44,8 +44,7 @@ int Show::execute(int argc, char** argv)
 
     const QStringList args = parser.positionalArguments();
     if (args.size() != 2) {
-        parser.showHelp();
-        return EXIT_FAILURE;
+        parser.showHelp(EXIT_FAILURE);
     }
 
     out << "Insert the database password\n> ";