2 files changed, 3 insertions, 2 deletions

diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index ab8771e3f..6c6f5f4b6 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -1626,7 +1626,7 @@ handle_record_store (void *cls, const struct RecordStoreMessage *rp_msg)
                                                               GNUNET_YES,
                                                               &emsg))
       {
-        send_store_response (nc, res, emsg, rid);
+        send_store_response (nc, GNUNET_SYSERR, emsg, rid);
         GNUNET_free (emsg);
         GNUNET_SERVICE_client_continue (nc->client);
         GNUNET_free (conv_name);
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index bb2f7465f..1432222db 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -410,7 +410,8 @@ handle_record_store_response (void *cls,
   if (NULL == qe)
     return;
   if (NULL != qe->cont)
-    qe->cont (qe->cont_cls, res, emsg);
+    qe->cont (qe->cont_cls, res,
+             (GNUNET_OK != res) ? NULL : emsg);
   free_qe (qe);
 }