diff --git a/libmapper/mapper.c b/libmapper/mapper.c
index 8acc741..3c43eb9 100644
--- a/libmapper/mapper.c
+++ b/libmapper/mapper.c
@@ -334,7 +334,10 @@
     wait->userdata = userdata;
     wait->count = sarraylen(objs);
     if (!wait->count)
-        return 0;
+    {
+        r = 0;
+        goto free_wait;
+    }
 
     wait->objs = sarraydup(objs);
     if (!wait->objs)