1 files changed, 26 insertions, 13 deletions

diff --git a/src/main_window_file_publish.c b/src/main_window_file_publish.c
index b0ce1f11..3b1f8b29 100644
--- a/src/main_window_file_publish.c
+++ b/src/main_window_file_publish.c
@@ -680,10 +680,13 @@ add_entry_to_ts (GtkTreeStore *ts,
     }
   ksk_uri = GNUNET_FS_uri_ksk_create_from_meta_data (meta);
   kill_ksk = GNUNET_FS_uri_ksk_create_from_meta_data (md_no_ksk);
-  GNUNET_FS_uri_ksk_get_keywords (kill_ksk,
-                                  &remove_keyword,
-                                  ksk_uri);
-  GNUNET_FS_uri_destroy (kill_ksk);
+  if (kill_ksk != NULL)
+    {
+      GNUNET_FS_uri_ksk_get_keywords (kill_ksk,
+                                      &remove_keyword,
+                                      ksk_uri);
+      GNUNET_FS_uri_destroy (kill_ksk);
+    }
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (ts),
                                   iter);
   row_reference = gtk_tree_row_reference_new (GTK_TREE_MODEL (ts),
@@ -698,16 +701,26 @@ add_entry_to_ts (GtkTreeStore *ts,
       GNUNET_FS_uri_ksk_add_keyword (ksk_uri,
                                      GNUNET_FS_DIRECTORY_MIME,
                                      GNUNET_NO);
+      fi = GNUNET_FS_file_information_create_empty_directory (GNUNET_GTK_get_fs_handle (),
+                                                              row_reference,
+                                                              ksk_uri,
+                                                              meta,
+                                                              anonymity_level,
+                                                              priority,
+                                                              expiration);
+    }
+  else
+    {
+      fi = GNUNET_FS_file_information_create_from_file (GNUNET_GTK_get_fs_handle (),
+                                                        row_reference,
+                                                        filename,
+                                                        ksk_uri,
+                                                        meta,
+                                                        do_index,
+                                                        anonymity_level,
+                                                        priority,
+                                                        expiration);
     }
-  fi = GNUNET_FS_file_information_create_from_file (GNUNET_GTK_get_fs_handle (),
-                                                    row_reference,
-                                                    filename,
-                                                    ksk_uri,
-                                                    meta,
-                                                    do_index,
-                                                    anonymity_level,
-                                                    priority,
-                                                    expiration);
   GNUNET_CONTAINER_meta_data_destroy (meta);
   GNUNET_FS_uri_destroy (ksk_uri);
   if (S_ISDIR (sbuf.st_mode))