2 files changed, 5 insertions, 2 deletions

diff --git a/src/bin/log.c b/src/bin/log.c
index 4f0015d..4bd64e7 100644
--- a/src/bin/log.c
+++ b/src/bin/log.c
@@ -177,10 +177,11 @@ log_line_event(void *data,
    eina_iterator_free(it);
 
    if (log->todel)
-     return EINA_TRUE;
+     goto log_end;
 
    _log_send(smman, log);
 
+log_end:
    _log_free(log);
    return EINA_TRUE;
 }
diff --git a/src/lib/store/store_event.c b/src/lib/store/store_event.c
index 2c60261..45b2010 100644
--- a/src/lib/store/store_event.c
+++ b/src/lib/store/store_event.c
@@ -71,13 +71,15 @@ store_event_complete(void *data,
                                   eina_strbuf_string_get(sa->data.buf));
         sa->cb.error((void *)sa->cb.data, sa->store, errstr);
         free(errstr);
-        return EINA_TRUE;
+        goto complete_end;
      }
 
    sa->cb.done((void *)sa->cb.data,
                sa->store,
                (char *)eina_strbuf_string_get(sa->data.buf),
                eina_strbuf_length_get(sa->data.buf));
+
+complete_end:
    store_add_free(sa);
    return EINA_TRUE;
 }