diff --git a/gramps/src/GrampsParser.py b/gramps/src/GrampsParser.py
index 7403013a0..920c28c17 100644
--- a/gramps/src/GrampsParser.py
+++ b/gramps/src/GrampsParser.py
@@ -329,7 +329,7 @@ class GrampsParser(handler.ContentHandler):
     #
     #---------------------------------------------------------------------
     def start_source(self,attrs):
-        self.source = self.db.findSourceNoMap(ul2(attrs["id"]))
+        self.source = self.db.findSourceNoMap(u2l(attrs["id"]))
 
     #---------------------------------------------------------------------
     #
@@ -841,7 +841,7 @@ class GrampsParser(handler.ContentHandler):
 	    f,self.func = GrampsParser.func_map[tag]
             if f:
                 f(self,attrs)
-        except:
+        except KeyError:
             GrampsParser.func_map[tag] = (None,None)
             self.func = None