diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 1a287e4f6..bda911789 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -6,6 +6,10 @@
 	* src/plugins/WriteFtree.py (FtreeWriterOptionBox.get_option_box):
 	Build person-centered filters only if a person is selected.
 
+	* src/PedView.py (load_canvas): Set anchor_txt to None if no
+	person is selected; (set_anchor,remove_anchor): Only set anchor
+	text if anchor_txt evaluates as True.
+
 2005-06-15  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/po/de.po: Applied patches from Jens Seidel <jensseidel@users.sf.net>
 	and Anton Huber <anton_huber@gmx.de>
diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py
index 6b0724452..f809436f9 100644
--- a/gramps2/src/PedView.py
+++ b/gramps2/src/PedView.py
@@ -224,6 +224,7 @@ class PedigreeView:
         if person is not self.active_person:
             self.active_person = person
         if person == None:
+            self.anchor_txt = None
             return
 
         h = 0
@@ -358,11 +359,13 @@ class PedigreeView:
             self.anchor = self.active_person
         else:
             self.anchor = None
-        self.anchor_txt.set(text=self.make_anchor_label())
+        if self.anchor_txt:
+            self.anchor_txt.set(text=self.make_anchor_label())
 
     def remove_anchor(self):
         self.anchor = None
-        self.anchor_txt.set(text=self.make_anchor_label())
+        if self.anchor_txt:
+            self.anchor_txt.set(text=self.make_anchor_label())
 
     def on_anchor_set(self,junk):
         self.set_anchor()