diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index e00b1be01..51fd52297 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,6 +1,9 @@
+2005-06-15  Alex Roitman  <shura@gramps-project.org>
+	* src/WriteGedcom.py (GedcomWriterOptionBox.__init__): Build
+	person-centered filters only if a person is selected.
+
 2005-06-15  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/po/de.po: Applied patch from Jens Seidel <jensseidel@users.sf.net>
-
 2005-06-10  Alex Roitman  <shura@gramps-project.org>
 	* src/docgen/AbiWord2Doc.py: Only embed one data chunk per image
 	file; add empty paragraph if the image is not in paragraph already.
diff --git a/gramps2/src/WriteGedcom.py b/gramps2/src/WriteGedcom.py
index e4bd06249..4133b3e4e 100644
--- a/gramps2/src/WriteGedcom.py
+++ b/gramps2/src/WriteGedcom.py
@@ -329,20 +329,23 @@ class GedcomWriterOptionBox:
         all.set_name(_("Entire Database"))
         all.add_rule(GenericFilter.Everyone([]))
 
-        des = GenericFilter.GenericFilter()
-        des.set_name(_("Descendants of %s") % NameDisplay.displayer.display(self.person))
-        des.add_rule(GenericFilter.IsDescendantOf([self.person.get_handle(),1]))
+        if self.person:
+            des = GenericFilter.GenericFilter()
+            des.set_name(_("Descendants of %s") % NameDisplay.displayer.display(self.person))
+            des.add_rule(GenericFilter.IsDescendantOf([self.person.get_handle(),1]))
 
-        ans = GenericFilter.GenericFilter()
-        ans.set_name(_("Ancestors of %s") % NameDisplay.displayer.display(self.person))
-        ans.add_rule(GenericFilter.IsAncestorOf([self.person.get_handle(),1]))
+            ans = GenericFilter.GenericFilter()
+            ans.set_name(_("Ancestors of %s") % NameDisplay.displayer.display(self.person))
+            ans.add_rule(GenericFilter.IsAncestorOf([self.person.get_handle(),1]))
 
-        com = GenericFilter.GenericFilter()
-        com.set_name(_("People with common ancestor with %s") %
-                     NameDisplay.displayer.display(self.person))
-        com.add_rule(GenericFilter.HasCommonAncestorWith([self.person.get_handle()]))
+            com = GenericFilter.GenericFilter()
+            com.set_name(_("People with common ancestor with %s") %
+                         NameDisplay.displayer.display(self.person))
+            com.add_rule(GenericFilter.HasCommonAncestorWith([self.person.get_handle()]))
 
-        self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com])
+            self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com])
+        else:
+            self.filter_menu = GenericFilter.build_filter_menu([all])
         filter_obj.set_menu(self.filter_menu)
 
         gedmap = GedcomInfo.GedcomInfoDB()