diff --git a/gramps/gen/merge/diff.py b/gramps/gen/merge/diff.py index 7f9ab581b..111b6f2d1 100644 --- a/gramps/gen/merge/diff.py +++ b/gramps/gen/merge/diff.py @@ -475,7 +475,10 @@ class Struct(object): """ if hasattr(item, "classname") and self.db: obj = self.db.get_from_name_and_handle(item.classname, str(item)) - return Struct(obj.to_struct(), self.db) + if obj: + return Struct(obj.to_struct(), self.db) + else: + return None else: return item