diff --git a/gramps/gen/db/base.py b/gramps/gen/db/base.py
index 9b8cf264b..5b15d0c66 100644
--- a/gramps/gen/db/base.py
+++ b/gramps/gen/db/base.py
@@ -239,7 +239,7 @@ class DbReadBase(object):
         """
         Find a Event in the database from the passed Gramps ID.
 
-        If no such Event exists, None is returned.
+        If no such Event exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -308,7 +308,7 @@ class DbReadBase(object):
         """
         Find a Family in the database from the passed Gramps ID.
 
-        If no such Family exists, None is returned.
+        If no such Family exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -423,7 +423,7 @@ class DbReadBase(object):
         """
         Find a Note in the database from the passed Gramps ID.
 
-        If no such Note exists, None is returned.
+        If no such Note exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -508,7 +508,7 @@ class DbReadBase(object):
         """
         Find an Object in the database from the passed Gramps ID.
 
-        If no such Object exists, None is returned.
+        If no such Object exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -544,7 +544,7 @@ class DbReadBase(object):
         """
         Find a Person in the database from the passed Gramps ID.
 
-        If no such Person exists, None is returned.
+        If no such Person exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -589,7 +589,7 @@ class DbReadBase(object):
         """
         Find a Place in the database from the passed Gramps ID.
 
-        If no such Place exists, None is returned.
+        If no such Place exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -705,7 +705,7 @@ class DbReadBase(object):
         """
         Find a Repository in the database from the passed Gramps ID.
 
-        If no such Repository exists, None is returned.
+        If no such Repository exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -761,7 +761,7 @@ class DbReadBase(object):
         """
         Find a Source in the database from the passed Gramps ID.
 
-        If no such Source exists, None is returned.
+        If no such Source exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -806,7 +806,7 @@ class DbReadBase(object):
         """
         Find a Citation in the database from the passed Gramps ID.
 
-        If no such Citation exists, None is returned.
+        If no such Citation exists, a HandleError is raised.
         """
         raise NotImplementedError
 
@@ -835,7 +835,7 @@ class DbReadBase(object):
         """
         Find a Tag in the database from the passed handle.
 
-        If no such Tag exists, None is returned.
+        If no such Tag exists, a HandleError is raised.
         """
         raise NotImplementedError
 
diff --git a/gramps/plugins/database/bsddb_support/read.py b/gramps/plugins/database/bsddb_support/read.py
index 0865b2ce7..9084023ac 100644
--- a/gramps/plugins/database/bsddb_support/read.py
+++ b/gramps/plugins/database/bsddb_support/read.py
@@ -718,7 +718,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Person in the database from the passed handle.
 
-        If no such Person exists, None is returned.
+        If no such Person exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Person, self.person_map)
 
@@ -726,7 +726,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Source in the database from the passed handle.
 
-        If no such Source exists, None is returned.
+        If no such Source exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Source, self.source_map)
 
@@ -734,7 +734,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Citation in the database from the passed handle.
 
-        If no such Citation exists, None is returned.
+        If no such Citation exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Citation, self.citation_map)
 
@@ -742,7 +742,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find an Object in the database from the passed handle.
 
-        If no such Object exists, None is returned.
+        If no such Object exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, MediaObject, self.media_map)
 
@@ -750,7 +750,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Place in the database from the passed handle.
 
-        If no such Place exists, None is returned.
+        If no such Place exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Place, self.place_map)
 
@@ -758,7 +758,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Event in the database from the passed handle.
 
-        If no such Event exists, None is returned.
+        If no such Event exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Event, self.event_map)
 
@@ -766,7 +766,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Family in the database from the passed handle.
 
-        If no such Family exists, None is returned.
+        If no such Family exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Family, self.family_map)
 
@@ -774,7 +774,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Repository in the database from the passed handle.
 
-        If no such Repository exists, None is returned.
+        If no such Repository exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Repository, self.repository_map)
 
@@ -782,7 +782,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Note in the database from the passed handle.
 
-        If no such Note exists, None is returned.
+        If no such Note exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Note, self.note_map)
 
@@ -790,7 +790,7 @@ class DbBsddbRead(DbReadBase, Callback):
         """
         Find a Tag in the database from the passed handle.
 
-        If no such Tag exists, None is returned.
+        If no such Tag exists, a HandleError is raised.
         """
         return self.get_from_handle(handle, Tag, self.tag_map)