diff -x CVS -pruN tracker.orig/src/trackerd/tracker-metadata.c tracker.modif/src/trackerd/tracker-metadata.c
--- tracker.orig/src/trackerd/tracker-metadata.c	2006-09-07 13:06:15.000000000 +0200
+++ tracker.modif/src/trackerd/tracker-metadata.c	2006-09-07 22:02:32.000000000 +0200
@@ -231,7 +231,9 @@ char *
 tracker_metadata_get_text_file (const char *uri, const char *mime)
 {
 	MetadataFileType ftype;
-	char *tmp, *text_filter_file;
+	char		 *text_filter_file;
+
+	text_filter_file = NULL;
 
 	ftype = tracker_get_metadata_type (mime);
 
@@ -242,6 +244,7 @@ tracker_metadata_get_text_file (const ch
 		return g_strdup (uri);
 
 	} else {
+		char *tmp;
 
 		tmp = g_strdup (DATADIR "/tracker/filters/");
 
@@ -250,10 +253,10 @@ tracker_metadata_get_text_file (const ch
 		g_free (tmp);
 	}
 
-	if (g_file_test (text_filter_file, G_FILE_TEST_EXISTS)) {
+	if (text_filter_file && g_file_test (text_filter_file, G_FILE_TEST_EXISTS)) {
 		char *argv[4];
 		char *temp_file_name;
-		int fd;
+		int  fd;
 
 		fd = g_file_open_tmp (NULL, &temp_file_name, NULL);
 
@@ -316,7 +319,7 @@ tracker_metadata_get_text_file (const ch
 char *
 tracker_metadata_get_thumbnail (const char *uri, const char *mime, const char *max_size)
 {
-	char *tmp, *tmp_file, *thumbnailer;
+	char *tmp, *thumbnailer;
 
 	tmp = g_strdup (DATADIR "/tracker/thumbnailers/");
 
@@ -326,7 +329,8 @@ tracker_metadata_get_thumbnail (const ch
 
 	if (g_file_test (thumbnailer, G_FILE_TEST_EXISTS)) {
 		char *argv[5];
-		int fd;
+		char *tmp_file;
+		int  fd;
 
 		tmp = g_build_filename (g_get_home_dir (), ".Tracker", "thumbs", NULL);