diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index f3c21b3f5..44fbc950b 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -35,8 +35,7 @@ extern int whoami_main(int argc, char **argv)
 	my_getpwuid(user, uid);
 	if (user) {
 		puts(user);
-		exit(TRUE);
+		return EXIT_SUCCESS;
 	}
-	errorMsg("cannot find username for UID %u\n", (unsigned) uid);
-	return(FALSE);
+	fatalError("cannot find username for UID %u\n", (unsigned) uid);
 }
diff --git a/whoami.c b/whoami.c
index f3c21b3f5..44fbc950b 100644
--- a/whoami.c
+++ b/whoami.c
@@ -35,8 +35,7 @@ extern int whoami_main(int argc, char **argv)
 	my_getpwuid(user, uid);
 	if (user) {
 		puts(user);
-		exit(TRUE);
+		return EXIT_SUCCESS;
 	}
-	errorMsg("cannot find username for UID %u\n", (unsigned) uid);
-	return(FALSE);
+	fatalError("cannot find username for UID %u\n", (unsigned) uid);
 }