From b328f473cbc0dfece2dda7ba65b96edd36372ffb Mon Sep 17 00:00:00 2001
From: Michiel Nauta <m.d.nauta@hetnet.nl>
Date: Sun, 25 Dec 2011 09:29:24 +0000
Subject: [PATCH] 5290: Unhandled exception when merging people

svn: r18655
---
 src/DisplayState.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/DisplayState.py b/src/DisplayState.py
index 35566bba1..f55a94bf9 100644
--- a/src/DisplayState.py
+++ b/src/DisplayState.py
@@ -481,6 +481,11 @@ class DisplayState(gen.utils.Callback):
             return self.disprel_old
 
         active = dbstate.db.get_person_from_handle(active_handle)
+        if active is None:
+            # During merger this method can be called at a time when treemodel
+            # and database are not in sync, resulting in active_handle != None,
+            # but active == None; see bug 5290 for the details.
+            return u''
         name = self.relationship.get_one_relationship(
                                             dbstate.db, default_person, active)
         #store present call data