diff --git a/usr.bin/asa/asa.c b/usr.bin/asa/asa.c
index 22174ed340c..11438b60746 100644
--- a/usr.bin/asa/asa.c
+++ b/usr.bin/asa/asa.c
@@ -81,6 +81,9 @@ main(int argc, char *argv[])
 		}
 	}
 
+	if (fflush(stdout) != 0)
+		err(1, "stdout");
+
 	exit(exval);
 }
 
@@ -140,4 +143,7 @@ asa(FILE *f)
 
 		putchar('\n');
 	}
+
+	if (ferror(stdout) != 0)
+		err(1, "stdout");
 }