diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -725,7 +725,7 @@
 	fprintf(stderr, "       iscsictl -R -a\n");
 	fprintf(stderr, "       iscsictl -R -n nickname [-c path]\n");
 	fprintf(stderr, "       iscsictl -L [-v] [-w timeout]\n");
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
 int
@@ -745,8 +745,8 @@
 	struct target *targ;
 
 	argc = xo_parse_args(argc, argv);
-        if (argc < 0)
-                exit(1);
+	if (argc < 0)
+		exit(EXIT_FAILURE);
 
 	xo_open_container("iscsictl");
 
@@ -1053,10 +1053,11 @@
 		xo_err(1, "close");
 
 	xo_close_container("iscsictl");
-	xo_finish();
+	if (xo_finish() < 0)
+		xo_err(EXIT_FAILURE, "stdout");
 
 	if (failed != 0)
-		return (1);
+		exit(EXIT_FAILURE);
 
-	return (0);
+	exit(EXIT_SUCCESS);
 }