1 files changed, 11 insertions, 5 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 4658d23e..11a73be4 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -1215,11 +1215,17 @@ handle_publish_stop (struct PublishEntry *ent)
     /* get piter from parent */
     path = gtk_tree_row_reference_get_path (ent->rr);
     tm = gtk_tree_row_reference_get_model (ent->rr);
-    if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
-      GNUNET_break (0);
-    else
-      (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
-    gtk_tree_path_free (path);
+    /* This is a child of a directory, and we've had that directory
+     * freed already
+     */
+    if (path != NULL)
+    {
+      if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
+        GNUNET_break (0);
+      else
+        (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
+      gtk_tree_path_free (path);
+    }
   }
   gtk_tree_row_reference_free (ent->rr);
   if (ent->uri != NULL)