diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 03c78a30e..b20f3f1fe 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-13  Alex Roitman  <shura@gramps-project.org>
+	* src/RelLib/_NoteBase.py (NoteBase.serialize): Work out the case
+	of note being None -- leftover from gramps20.
+
 2006-03-11  Alex Roitman  <shura@gramps-project.org>
 	* src/PluginUtils/_ReportOptions.py: Use correct namespace for the
 	base clases from _Options module.
diff --git a/gramps2/src/RelLib/_NoteBase.py b/gramps2/src/RelLib/_NoteBase.py
index aaa8be252..70e2d605a 100644
--- a/gramps2/src/RelLib/_NoteBase.py
+++ b/gramps2/src/RelLib/_NoteBase.py
@@ -55,6 +55,8 @@ class NoteBase:
         self.note = Note(text)
 
     def serialize(self):
+        if self.note == None:
+            self.note = Note()
         return self.note.serialize()
 
     def unserialize(self,data):