diff --git a/src/core/execute-serialize.c b/src/core/execute-serialize.c
index bed2776889..9671899796 100644
--- a/src/core/execute-serialize.c
+++ b/src/core/execute-serialize.c
@@ -3740,21 +3740,21 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) {
                         if (c->root_image_policy)
                                 return -EINVAL; /* duplicated */
 
-                        r = image_policy_from_string(val, /* graceful= */ true, &c->root_image_policy);
+                        r = image_policy_from_string(val, /* graceful= */ false, &c->root_image_policy);
                         if (r < 0)
                                 return r;
                 } else if ((val = startswith(l, "exec-context-mount-image-policy="))) {
                         if (c->mount_image_policy)
                                 return -EINVAL; /* duplicated */
 
-                        r = image_policy_from_string(val, /* graceful= */ true, &c->mount_image_policy);
+                        r = image_policy_from_string(val, /* graceful= */ false, &c->mount_image_policy);
                         if (r < 0)
                                 return r;
                 } else if ((val = startswith(l, "exec-context-extension-image-policy="))) {
                         if (c->extension_image_policy)
                                 return -EINVAL; /* duplicated */
 
-                        r = image_policy_from_string(val, /* graceful= */ true, &c->extension_image_policy);
+                        r = image_policy_from_string(val, /* graceful= */ false, &c->extension_image_policy);
                         if (r < 0)
                                 return r;
                 } else
diff --git a/src/shared/image-policy.c b/src/shared/image-policy.c
index bd758ea1c9..59d422dcd2 100644
--- a/src/shared/image-policy.c
+++ b/src/shared/image-policy.c
@@ -231,7 +231,7 @@ PartitionPolicyFlags partition_policy_flags_from_string(const char *s, bool grac
                 ff = policy_flag_from_string_one(strstrip(f));
                 if (ff < 0) {
                         if (graceful) {
-                                log_debug("Unknown partition policy flag: %s, ignoring", f);
+                                log_debug("Unknown partition policy flag, ignoring: %s", f);
                                 continue;
                         }
                         return -EBADRQC; /* recognizable error */
@@ -345,7 +345,7 @@ int image_policy_from_string(const char *s, bool graceful, ImagePolicy **ret) {
                                 if (!graceful)
                                         return log_debug_errno(SYNTHETIC_ERRNO(EBADSLT), "Unknown partition designator: %s", ds); /* recognizable error */
 
-                                log_debug("Unknown partition designator: %s, ignoring", ds);
+                                log_debug("Unknown partition designator, ignoring: %s", ds);
                                 continue;
                         }
                         if (dmask & (UINT64_C(1) << designator))