diff --git a/meson.build b/meson.build
index 5db299a2a7..659aecd421 100644
--- a/meson.build
+++ b/meson.build
@@ -2998,7 +2998,7 @@ if spatch.found()
         foreach dir : coccinelle_src_dirs
                 if dir not in coccinelle_exclude
                         test(
-                                'coccinelle-@0@'.format(fs.name(dir)),
+                                'coccinelle-@0@'.format(fs.name(dir.strip('/'))),
                                 check_coccinelle_sh,
                                 args : [meson.project_source_root() / dir,
                                         meson.project_source_root() / 'coccinelle'],
diff --git a/src/libsystemd/sd-varlink/sd-varlink.c b/src/libsystemd/sd-varlink/sd-varlink.c
index 4beb785199..90be017705 100644
--- a/src/libsystemd/sd-varlink/sd-varlink.c
+++ b/src/libsystemd/sd-varlink/sd-varlink.c
@@ -3100,11 +3100,8 @@ _public_ int sd_varlink_set_sentinel(sd_varlink *v, const char *error_id) {
                       -EUCLEAN);
 
         char *s = NULL;
-        if (error_id) {
-                s = strdup(error_id);
-                if (!s)
-                        return log_oom_debug();
-        }
+        if (strdup_to(&s, error_id) < 0)
+                return log_oom_debug();
 
         if (v->sentinel != POINTER_MAX)
                 free(v->sentinel);