diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index c6494b99a9..91b98b4f87 100644
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -172,11 +172,10 @@ static int run(int argc, char *argv[]) {
 
         /* The write shall not return if a resume takes place. */
         r = write_resume_config(st.st_rdev, arg_info.offset, arg_info.device);
-        log_full_errno(r < 0 ? LOG_ERR : LOG_DEBUG,
+        log_full_errno(r < 0 || arg_info.efi ? LOG_WARNING : LOG_INFO,
                        r < 0 ? r : SYNTHETIC_ERRNO(ENOENT),
                        "Unable to resume from device '%s' (" DEVNUM_FORMAT_STR ") offset %" PRIu64 ", continuing boot process.",
                        arg_info.device, DEVNUM_FORMAT_VAL(st.st_rdev), arg_info.offset);
-
         return r;
 }
 
diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index db963df39e..e7712fa274 100644
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -206,7 +206,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
                   p->what,
                   p->where,
                   p->type,
-                  strna(o));
+                  o ?: "''");
 
         r = mount_verbose_full(priority, p->what, p->where, p->type, p->flags, o, FLAGS_SET(p->mode, MNT_FOLLOW_SYMLINK));
         if (r < 0)