diff --git a/cfg.mk b/cfg.mk
index 26a5966fc..178ff7625 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -436,7 +436,7 @@ sc_prohibit_test_empty:
 sc_some_programs_must_avoid_exit_failure:
 	@grep -nw EXIT_FAILURE						\
 	    $$(git grep -El '[^T]_FAILURE|EXIT_CANCELED' src)		\
-	  | grep -vE '= EXIT_FAILURE|exit \(.* \?' | grep .		\
+	  | grep -vE '= EXIT_FAILURE|return .* \?' | grep .		\
 	    && { echo '$(ME): do not use EXIT_FAILURE in the above'	\
 		  1>&2; exit 1; } || :
 
diff --git a/src/whoami.c b/src/whoami.c
index 545e52134..5ec0dc114 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
   uid = geteuid ();
   pw = (uid == NO_UID && errno ? NULL : getpwuid (uid));
   if (!pw)
-    error (EXIT_FAILURE, errno, "cannot find name for user ID %lu",
+    error (EXIT_FAILURE, errno, _("cannot find name for user ID %lu"),
            (unsigned long int) uid);
   puts (pw->pw_name);
   return EXIT_SUCCESS;