diff --git a/src/core/execute.c b/src/core/execute.c
index 70b7b8dc3c..a67eb716e4 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2630,7 +2630,7 @@ static int apply_mount_namespace(
 
                         if (streq_ptr(runtime->var_tmp_dir, RUN_SYSTEMD_EMPTY))
                                 var_tmp_dir = runtime->var_tmp_dir;
-                        else if (runtime->tmp_dir)
+                        else if (runtime->var_tmp_dir)
                                 var_tmp_dir = strjoina(runtime->var_tmp_dir, "/tmp");
                 }
 
diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c
index 892de7071a..058ee5c8ea 100644
--- a/src/machine/machined-varlink.c
+++ b/src/machine/machined-varlink.c
@@ -268,7 +268,7 @@ static int group_lookup_name(Manager *m, const char *name, gid_t *ret_gid) {
                 return -ENOMEM;
 
         machine = hashmap_get(m->machines, mn);
-        if (!mn)
+        if (!machine)
                 return -ESRCH;
 
         if (machine->class != MACHINE_CONTAINER)