1 files changed, 8 insertions, 4 deletions

diff --git a/src/fs_event_handler.c b/src/fs_event_handler.c
index f37d575e..d1c88d6b 100644
--- a/src/fs_event_handler.c
+++ b/src/fs_event_handler.c
@@ -770,7 +770,8 @@ add_search_result (struct SearchTab *tab,
   char *uris;
   GdkPixbuf *pixbuf;
 
-  if ( (!GNUNET_FS_uri_test_loc (uri)) &&
+  if ( (uri != NULL) &&
+       (!GNUNET_FS_uri_test_loc (uri)) &&
        (!GNUNET_FS_uri_test_chk (uri)) )
     {
       /* SKS support not implemented yet */
@@ -791,7 +792,10 @@ add_search_result (struct SearchTab *tab,
                                                         -1);
   if (desc == NULL)
     desc = GNUNET_strdup (_("no description supplied"));
-  uris = GNUNET_FS_uri_to_string (uri);
+  if (uri == NULL)
+    uris = GNUNET_strdup (_("no URI"));
+  else
+    uris = GNUNET_FS_uri_to_string (uri);
   mime = GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
                                                         EXTRACTOR_METATYPE_MIMETYPE,
                                                         EXTRACTOR_METATYPE_FORMAT,
@@ -807,8 +811,8 @@ add_search_result (struct SearchTab *tab,
                                      NULL,
                                      G_MAXINT,
                                      0, GNUNET_CONTAINER_meta_data_duplicate (meta),
-                                     1, GNUNET_FS_uri_dup (uri),
-                                     2, GNUNET_FS_uri_chk_get_file_size (uri),
+                                     1, (uri == NULL) ? NULL : GNUNET_FS_uri_dup (uri),
+                                     2, (uri == NULL) ? 0 : GNUNET_FS_uri_chk_get_file_size (uri),
                                      3, pixbuf /* preview */,
                                      4, 0 /* percent progress */,
                                      5, 0 /* percent availability */,