diff --git a/src/boot/bootctl-random-seed.c b/src/boot/bootctl-random-seed.c
index 430bbeb33d..deda4debd2 100644
--- a/src/boot/bootctl-random-seed.c
+++ b/src/boot/bootctl-random-seed.c
@@ -39,7 +39,7 @@ static int set_system_token(void) {
         r = getenv_bool("SYSTEMD_WRITE_SYSTEM_TOKEN");
         if (r < 0) {
                 if (r != -ENXIO)
-                         log_warning_errno(r, "Failed to parse $SYSTEMD_WRITE_SYSTEM_TOKEN, ignoring.");
+                        log_warning_errno(r, "Failed to parse $SYSTEMD_WRITE_SYSTEM_TOKEN, ignoring.");
         } else if (r == 0) {
                 log_notice("Not writing system token, because $SYSTEMD_WRITE_SYSTEM_TOKEN is set to false.");
                 return 0;
@@ -169,8 +169,8 @@ int install_random_seed(const char *esp) {
         return set_system_token();
 
 fail:
-        if (tmp)
-                (void) unlinkat(loader_dir_fd, tmp, 0);
+        assert(tmp);
+        (void) unlinkat(loader_dir_fd, tmp, 0);
 
         return r;
 }
diff --git a/src/tmpfiles/offline-passwd.c b/src/tmpfiles/offline-passwd.c
index 4ffed1c102..fe866f8ca1 100644
--- a/src/tmpfiles/offline-passwd.c
+++ b/src/tmpfiles/offline-passwd.c
@@ -9,27 +9,28 @@
 DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(uid_gid_hash_ops, char, string_hash_func, string_compare_func, free);
 
 static int open_passwd_file(const char *root, const char *fname, FILE **ret_file) {
-        _cleanup_free_ char *p = NULL, *bn = NULL;
+        _cleanup_free_ char *p = NULL;
         _cleanup_close_ int fd = -EBADF;
-        int r;
+        _cleanup_fclose_ FILE *f = NULL;
 
         fd = chase_symlinks_and_open(fname, root, CHASE_PREFIX_ROOT, O_RDONLY|O_CLOEXEC, &p);
         if (fd < 0)
                 return fd;
 
-        FILE *f = fdopen(fd, "r");
+        f = fdopen(fd, "r");
         if (!f)
                 return -errno;
 
         TAKE_FD(fd);
 
-        r = path_extract_filename(fname, &bn);
-        if (r < 0)
-                return r;
+        if (DEBUG_LOGGING) {
+                _cleanup_free_ char *bn = NULL;
 
-        log_debug("Reading %s entries from %s...", bn, p);
+                (void) path_extract_filename(fname, &bn);
+                log_debug("Reading %s entries from %s...", strna(bn), p);
+        }
 
-        *ret_file = f;
+        *ret_file = TAKE_PTR(f);
         return 0;
 }