diff --git a/src/check_update.c b/src/check_update.c
index e4ac6433..bf133c0a 100644
--- a/src/check_update.c
+++ b/src/check_update.c
@@ -162,7 +162,7 @@ int check_update_main(int argc, char **argv)
 	copyright_header("software update checker");
 
 	if (!parse_options(argc, argv)) {
-		return EXIT_FAILURE;
+		return EINVALID_OPTION;
 	}
 
 	ret = check_update();
diff --git a/src/clr_bundle_add.c b/src/clr_bundle_add.c
index de700954..6c027944 100644
--- a/src/clr_bundle_add.c
+++ b/src/clr_bundle_add.c
@@ -167,7 +167,7 @@ int bundle_add_main(int argc, char **argv)
 	copyright_header("bundle adder");
 
 	if (!parse_options(argc, argv)) {
-		return EXIT_FAILURE;
+		return EINVALID_OPTION;
 	}
 
 	if (list) {
diff --git a/src/main.c b/src/main.c
index a13bb461..5c7c2068 100644
--- a/src/main.c
+++ b/src/main.c
@@ -208,7 +208,7 @@ int update_main(int argc, char **argv)
 	copyright_header("software update");
 
 	if (!parse_options(argc, argv)) {
-		return EXIT_FAILURE;
+		return EINVALID_OPTION;
 	}
 
 	if (cmd_line_status) {
diff --git a/src/search.c b/src/search.c
index 5042251d..71cdf12c 100644
--- a/src/search.c
+++ b/src/search.c
@@ -486,7 +486,7 @@ int search_main(int argc, char **argv)
 	struct list *subs = NULL;
 
 	if (!parse_options(argc, argv)) {
-		return EXIT_FAILURE;
+		return EINVALID_OPTION;
 	}
 
 	ret = swupd_init(&lock_fd);
diff --git a/src/swupd.c b/src/swupd.c
index c3eea076..68d9c6e2 100644
--- a/src/swupd.c
+++ b/src/swupd.c
@@ -140,7 +140,7 @@ int main(int argc, char **argv)
 	int ret;
 
 	if (parse_options(argc, argv, &index) < 0) {
-		return EXIT_FAILURE;
+		return EINVALID_OPTION;
 	}
 
 	/* Reset optind to 0 (instead of the default value, 1) at this point,
diff --git a/src/verify.c b/src/verify.c
index 173b6a96..569c1680 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -596,7 +596,7 @@ int verify_main(int argc, char **argv)
 	copyright_header("software verify");
 
 	if (!parse_options(argc, argv)) {
-		return EXIT_FAILURE;
+		return EINVALID_OPTION;
 	}
 
 	/* parse command line options */