diff --git a/libmapper/mapper.c b/libmapper/mapper.c
index 0f93937..4b69ac2 100644
--- a/libmapper/mapper.c
+++ b/libmapper/mapper.c
@@ -178,10 +178,12 @@
     if (wait->finished)
         goto exit;
 
-    r = sd_bus_message_get_errno(m);
-    if (r == ENOENT)
+    if (sd_bus_message_is_method_error(
+            m, "xyz.openbmc_project.Common.Error.ResourceNotFound"))
         goto exit;
 
+    r = sd_bus_message_get_errno(m);
+
     if ((r == EBUSY || r == ENOBUFS) && data->retry < mapper_busy_retries)
     {
         r = sd_event_now(wait->loop, CLOCK_MONOTONIC, &next_retry);
@@ -412,7 +414,8 @@
 
     r = sd_bus_message_get_errno(m);
 
-    if (r == ENOENT)
+    if (sd_bus_message_is_method_error(
+            m, "xyz.openbmc_project.Common.Error.ResourceNotFound"))
     {
         if (subtree->op == MAPPER_OP_REMOVE)
             r = 0;