diff --git a/ChangeLog b/ChangeLog
index 70afaec76..f2b7949ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 2006-06-19  Don Allingham  <don@gramps-project.org>
+	* src/DataViews/_Relationship.py: handle person set to None
 	* src/ViewManger.py: try tabs on the side
 	* src/DisplayTabs/_PersonRefEmbedList.py: change Relationships to
 	Associations
diff --git a/src/DataViews/_RelationView.py b/src/DataViews/_RelationView.py
index dc3ae19c0..0185bc3c1 100644
--- a/src/DataViews/_RelationView.py
+++ b/src/DataViews/_RelationView.py
@@ -121,49 +121,49 @@ class RelationshipView(PageView.PersonNavView):
         if self.dbstate.active:
             while not self.change_person(self.dbstate.active.handle):
                 pass
-            self.dirty = False
         else:
-            self.dirty = True
+            self.change_person(None)
+        self.dirty = False
 
     def person_rebuild(self):
         if self.dbstate.active:
             while not self.change_person(self.dbstate.active.handle):
                 pass
-            self.dirty = False
         else:
-            self.dirty = True
+            self.change_person(None)
+        self.dirty = False
 
     def family_update(self, handle_list):
         if self.dbstate.active:
             while not self.change_person(self.dbstate.active.handle):
                 pass
-            self.dirty = False
         else:
-            self.dirty = True
+            self.change_person(None)
+        self.dirty = False
 
     def family_add(self, handle_list):
         if self.dbstate.active:
             while not self.change_person(self.dbstate.active.handle):
                 pass
-            self.dirty = False
         else:
-            self.dirty = True
+            self.change_person(None)
+        self.dirty = False
 
     def family_delete(self, handle_list):
         if self.dbstate.active:
             while not self.change_person(self.dbstate.active.handle):
                 pass
-            self.dirty = False
         else:
-            self.dirty = True
+            self.change_person(None)
+        self.dirty = False
 
     def family_rebuild(self):
         if self.dbstate.active:
             while not self.change_person(self.dbstate.active.handle):
                 pass
-            self.dirty = False
         else:
-            self.dirty = True
+            self.change_person(None)
+        self.dirty = False
             
     def get_stock(self):
         """
@@ -278,6 +278,8 @@ class RelationshipView(PageView.PersonNavView):
         if self.dbstate.active:
             self.handle_history(self.dbstate.active.handle)
             self.change_person(self.dbstate.active.handle)
+        else:
+            self.change_person(None)
         
     def change_person(self, obj):
         if self.redrawing: