fixes

2 files changed, 7 insertions, 1 deletions

diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 21675b0b7..5bb4160c2 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -729,10 +729,10 @@ process_status_message (void *cls,
               (int) status,
               emsg);
 #endif
+  process_queue (h);
   rc.cont (rc.cont_cls, 
            status,
            emsg);
-  process_queue (h);
 }
 
 
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index a9bcaf8e5..445ce18cf 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -164,6 +164,12 @@ read_update_information_graph (struct GNUNET_FS_Namespace *ns)
   char *emsg;
   
   fn = get_update_information_directory (ns);
+  if (GNUNET_YES !=
+      GNUNET_DISK_file_test (fn))
+    {
+      GNUNET_free (fn);
+      return;
+    }
   rh = GNUNET_BIO_read_open (fn);
   if (rh == NULL)
     {