diff -urN new/tracker/src/trackerd/tracker-db.c tracker/src/trackerd/tracker-db.c
--- new/tracker/src/trackerd/tracker-db.c	2006-08-02 15:02:30.000000000 +0200
+++ tracker/src/trackerd/tracker-db.c	2006-08-02 21:41:50.153957192 +0200
@@ -484,6 +484,10 @@
 	GTimeVal before, after;
 	double elapsed;
 
+	if (query == NULL) {
+		return NULL;
+	}
+
 	//tracker_log ("executing query:\n%s\n", query);
 	g_get_current_time (&before);
 	if (!lock_db ()) {