diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
index a4328aeafea8..3213f4b54b9c 100644
--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@@ -79,7 +79,7 @@ user_from_uid(uid, nouser)
 				return (NULL);
 		}
 	}
-	return (cp->name);
+	return (cp->found ? cp->name : NULL);
 }
 
 char *
@@ -115,5 +115,5 @@ group_from_gid(gid, nogroup)
 				return (NULL);
 		}
 	}
-	return (cp->name);
+	return (cp->found ? cp->name : NULL);
 }