diff --git a/src/mu-query-xapian.cc b/src/mu-query-xapian.cc
index b551fa0e..48b9b1dc 100644
--- a/src/mu-query-xapian.cc
+++ b/src/mu-query-xapian.cc
@@ -146,7 +146,11 @@ mu_query_xapian_new (const char* path)
 void
 mu_query_xapian_destroy (MuQueryXapian *self)
 {
+	if (!self)
+		return;
+
 	_uninit_mu_query_xapian (self);
+	g_free (self);
 }