1 files changed, 19 insertions, 20 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index c2062f4f..ab4fab5e 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -614,15 +614,14 @@ void create_namespace_clicked(GtkWidget * dummy1,
     nameLine = glade_xml_get_widget(metaXML,
                                     "namespaceNameEntry");
     namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine));
-    root = NULL;
-    if (OK == FSUI_createNamespace(ctx,
-                                   gtk_spin_button_get_value_as_int
-                                   (GTK_SPIN_BUTTON(spin)),
-                                   namespaceName,
-                                   meta,
-                                   keywordURI,
-                                   &rootEntry,
-                                   &root)) {
+    root = FSUI_createNamespace(ctx,
+                                gtk_spin_button_get_value_as_int
+                                (GTK_SPIN_BUTTON(spin)),
+                                namespaceName,
+                                meta,
+                                keywordURI,
+                                &rootEntry);
+    if (root != NULL) {
       ECRS_getNamespaceId(root,
                           &namespaceId);
       addTabForNamespace(NULL,
@@ -630,6 +629,7 @@ void create_namespace_clicked(GtkWidget * dummy1,
                          &namespaceId,
                          meta,
                          0);
+      ECRS_freeUri(root);
     } else {
       GtkWidget * dialog;
       
@@ -646,7 +646,6 @@ void create_namespace_clicked(GtkWidget * dummy1,
       gtk_dialog_run(GTK_DIALOG(dialog));
       gtk_widget_destroy(dialog);  
     }
-    ECRS_freeUri(root);
     ECRS_freeMetaData(meta);
     ECRS_freeUri(keywordURI);
   }
@@ -768,16 +767,16 @@ static void initiateUpload(GtkTreeModel * model,
     BREAK();
     return;
   }  
-  if (OK == FSUI_addToNamespace(ctx,
-                                cls->anonymityLevel,
-                                cls->namespaceName,
-                                cls->updateInterval,
-                                cls->lastId,
-                                &cls->thisId,
-                                cls->nextId,
-                                dst,
-                                meta,
-                                &resultURI)) {
+  resultURI = FSUI_addToNamespace(ctx,
+                                  cls->anonymityLevel,
+                                  cls->namespaceName,
+                                  cls->updateInterval,
+                                  cls->lastId,
+                                  &cls->thisId,
+                                  cls->nextId,
+                                  dst,
+                                  meta);
+  if (resultURI != NULL) {
     list = head;
     while ( (list != NULL) &&
             (0 != strcmp(cls->namespaceName,