diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py
index 9223021e2..e480a0021 100644
--- a/gramps2/src/GrampsCfg.py
+++ b/gramps2/src/GrampsCfg.py
@@ -128,11 +128,11 @@ panellist = [
 #
 #-------------------------------------------------------------------------
 
-iprefix       = "I"
-oprefix       = "O"
-sprefix       = "S"
-pprefix       = "P"
-fprefix       = "F"
+iprefix       = "I%04d"
+oprefix       = "O%04d"
+sprefix       = "S%04d"
+pprefix       = "P%04d"
+fprefix       = "F%04d"
 autoload      = 0
 autosave_int  = 0
 uselds        = 0
diff --git a/gramps2/src/plugins/ReadGedcom.py b/gramps2/src/plugins/ReadGedcom.py
index fa2231bcd..20293df9e 100644
--- a/gramps2/src/plugins/ReadGedcom.py
+++ b/gramps2/src/plugins/ReadGedcom.py
@@ -337,9 +337,6 @@ class GedcomParser:
             next_line = self.f.readline()
             self.text = string.translate(next_line.strip(),self.trans,self.delc)
 
-            if not self.text:
-                raise Errors.GedcomError(_("GEDCOM file ended unexpectedly"))
-
             try:
                 self.text = self.cnv(self.text)
             except:
@@ -354,8 +351,11 @@ class GedcomParser:
                 else:
                     self.groups = (int(l[0]),l[1],l[2])
             except:
-		msg = _("Warning: line %d was not understood, so it was ignored.") % self.index
-                msg = "%s\n\t%s\n" % (msg,self.text)
+                if self.text == "":
+                    msg = _("Warning: line %d was blank, so it was ignored.\n") % self.index
+                else:
+                    msg = _("Warning: line %d was not understood, so it was ignored.") % self.index
+                    msg = "%s\n\t%s\n" % (msg,self.text)
                 self.errmsg(msg)
                 self.error_count = self.error_count + 1
                 self.groups = (999, "XXX", "XXX")
@@ -518,7 +518,8 @@ class GedcomParser:
                     noteobj = RelLib.Note()
                     self.nmap[matches[1]] = noteobj
                 text =  matches[2][4:]
-                noteobj.append(text + self.parse_continue_data(1))
+#                noteobj.append(text + self.parse_continue_data(1))
+                noteobj.append(text + self.parse_note_continue(1))
                 self.parse_note_data(1)
 	    elif matches[1] == "TRLR":
                 self.backup()