diff --git a/check-commit-sig.c b/check-commit-sig.c
index 26d1efeca..132ec4562 100644
--- a/check-commit-sig.c
+++ b/check-commit-sig.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
  	opt_parse(&argc, argv, opt_log_stderr_exit);
 
 	if (argc != 7)
-		opt_usage_and_exit(NULL);
+		opt_usage_exit_fail("Expected 6 arguments");
 
 	o1 = pkt_from_file(argv[1], PKT__PKT_OPEN)->open;
 	o2 = pkt_from_file(argv[2], PKT__PKT_OPEN)->open;
diff --git a/leak-anchor-sigs.c b/leak-anchor-sigs.c
index b04d65660..82dab6bac 100644
--- a/leak-anchor-sigs.c
+++ b/leak-anchor-sigs.c
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
  	opt_parse(&argc, argv, opt_log_stderr_exit);
 
 	if (argc != 2)
-		opt_usage_and_exit(NULL);
+		opt_usage_exit_fail("Expected 1 argument");
 
 	s = pkt_from_file(argv[1], PKT__PKT_OPEN_ANCHOR_SCRIPTSIGS)
 		->open_anchor_scriptsigs;
diff --git a/open-anchor-scriptsigs.c b/open-anchor-scriptsigs.c
index f8ddb1b3f..5bb64535a 100644
--- a/open-anchor-scriptsigs.c
+++ b/open-anchor-scriptsigs.c
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
  	opt_parse(&argc, argv, opt_log_stderr_exit);
 
 	if (argc < 3)
-		opt_usage_and_exit(NULL);
+		opt_usage_exit_fail("Expected 2 or more arguments");
 
 	o1 = pkt_from_file(argv[1], PKT__PKT_OPEN)->open;
 	o2 = pkt_from_file(argv[2], PKT__PKT_OPEN)->open;
diff --git a/open-channel.c b/open-channel.c
index 36e11abe6..555622933 100644
--- a/open-channel.c
+++ b/open-channel.c
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
  	opt_parse(&argc, argv, opt_log_stderr_exit);
 
 	if (argc < 7)
-		opt_usage_and_exit(NULL);
+		opt_usage_exit_fail("Expected 6 or more arguments");
 
 	if (!hex_decode(argv[1], strlen(argv[1]), &seed, sizeof(seed)))
 		errx(1, "Invalid seed '%s' - need 256 hex bits", argv[1]);
diff --git a/open-commit-sig.c b/open-commit-sig.c
index e801b8f30..321ddeb87 100644
--- a/open-commit-sig.c
+++ b/open-commit-sig.c
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
  	opt_parse(&argc, argv, opt_log_stderr_exit);
 
 	if (argc != 6)
-		opt_usage_and_exit(NULL);
+		opt_usage_exit_fail("Expected 5 arguments");
 
 	o1 = pkt_from_file(argv[1], PKT__PKT_OPEN)->open;
 	o2 = pkt_from_file(argv[2], PKT__PKT_OPEN)->open;