Comment 11 for bug 1259562

Right, it's logical to clean up the icon as well. (Guest users typically don't bother with icons, which explains why I missed it.)

Maybe checking errno would provide sufficient safety?

   errno = 0;
   pwent = getpwnam (name);
   if (pwent == NULL && errno == 0) {