2 files changed, 3 insertions, 3 deletions

diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h
index aa2646c0a..f827f8766 100644
--- a/src/datastore/datastore.h
+++ b/src/datastore/datastore.h
@@ -27,7 +27,7 @@
 #ifndef DATASTORE_H
 #define DATASTORE_H
 
-#define DEBUG_DATASTORE GNUNET_NO
+#define DEBUG_DATASTORE GNUNET_YES
 
 #include "gnunet_util_lib.h"
 
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index aaad7118f..21675b0b7 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -682,11 +682,11 @@ process_status_message (void *cls,
   if (msg == NULL)
     {      
       free_queue_entry (qe);
+      if (NULL == h->client)
+        return; /* forced disconnect */
       rc.cont (rc.cont_cls, 
                GNUNET_SYSERR,
                _("Failed to receive response from database."));
-      if (NULL == h->client)
-        return; /* forced disconnect */
       if (was_transmitted == GNUNET_YES)
         do_disconnect (h);
       return;