diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 8376868136b741d14ab3aaf2cdcfe75676535260..6b0fd3930a6843967d8420f52533b3983c84e4ee 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -712,8 +712,6 @@ static int write_temporary_shadow(
                 if (r == 0)
                         break;
         }
-        if (!IN_SET(errno, 0, ENOENT))
-                return -errno;
 
         r = fflush_sync_and_check(shadow);
         if (r < 0)
@@ -808,7 +806,7 @@ static int write_temporary_group(
                 r = putgrent_with_members(c, &n, group);
                 if (r < 0)
                         return log_error_errno(r, "Failed to add new group \"%s\" to temporary group file: %m",
-                                               gr->gr_name);
+                                               n.gr_name);
 
                 group_changed = true;
         }
@@ -1645,7 +1643,7 @@ static int item_equivalent(Item *a, Item *b) {
         if (!streq_ptr(a->home, b->home)) {
                 log_syntax(NULL, LOG_DEBUG, a->filename, a->line, 0,
                            "Item not equivalent because home directories differ ('%s' vs. '%s')",
-                           strempty(a->description), strempty(b->description));
+                           strempty(a->home), strempty(b->home));
                 return false;
         }