diff --git a/ChangeLog b/ChangeLog
index 2915363c3..0c5402373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-21  Don Allingham  <don@gramps-project.org>
+	* src/GrampsDb/_GrampsBSDDB.py: catch exceptions
+	* src/DisplayState.py: catch exceptions
+	* src/DbLoader.py: catch exceptions (DbLoader.read_file): catch exception
+	* src/Filters/SideBar/_SidebarFilter.py: add tooltips for dates
+	* src/Filters/SideBar/_PersonSidebarFilter.py: add tooltips for dates
+
 2007-01-21 Richard Taylor  <rjt-gramps@thegrindstone.me.uk>
         * ObjectSelector/_FilterFrameBase.py, ObjectSelector/_ObjectSelectorWindow.py,
 	  ObjectSelector/_FamilyFilterFrame.py, ObjectSelector/_PersonPreviewFrame.py,
diff --git a/src/Assistant.py b/src/Assistant.py
index 36d237341..fd78eae7d 100644
--- a/src/Assistant.py
+++ b/src/Assistant.py
@@ -42,7 +42,6 @@ log = logging.getLogger(".Assistant")
 #
 #-------------------------------------------------------------------------
 import gtk
-import gtk.gdk
 import gobject
 
 #-------------------------------------------------------------------------
diff --git a/src/DataViews/_EventView.py b/src/DataViews/_EventView.py
index d0ec87872..85b306682 100644
--- a/src/DataViews/_EventView.py
+++ b/src/DataViews/_EventView.py
@@ -38,7 +38,6 @@ import Utils
 import Errors
 import Bookmarks
 import Config
-import const
 from DdTargets import DdTargets
 from QuestionDialog import QuestionDialog
 from Editors import EditEvent, DelEventQuery
diff --git a/src/DataViews/_FamilyList.py b/src/DataViews/_FamilyList.py
index efc6c2936..d16448522 100644
--- a/src/DataViews/_FamilyList.py
+++ b/src/DataViews/_FamilyList.py
@@ -37,7 +37,6 @@ import DisplayModels
 import Bookmarks
 import Errors
 import Config
-import const
 from Filters.SideBar import FamilySidebarFilter
 
 #-------------------------------------------------------------------------
diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py
index 91c3119bb..37e78e935 100644
--- a/src/DataViews/_PersonView.py
+++ b/src/DataViews/_PersonView.py
@@ -67,7 +67,7 @@ import Config
 import const
 
 from Editors import EditPerson
-from Filters import SearchBar, SearchFilter, ExactSearchFilter
+from Filters import SearchBar
 from Filters.SideBar import PersonSidebarFilter
 from DdTargets import DdTargets
 
diff --git a/src/DataViews/_PlaceView.py b/src/DataViews/_PlaceView.py
index 2527a0fee..06d279ec4 100644
--- a/src/DataViews/_PlaceView.py
+++ b/src/DataViews/_PlaceView.py
@@ -44,7 +44,6 @@ import DisplayModels
 import Utils
 import Errors
 import Bookmarks
-import const
 import Config
 from DdTargets import DdTargets
 from Editors import EditPlace, DeletePlaceQuery
diff --git a/src/DataViews/_RepositoryView.py b/src/DataViews/_RepositoryView.py
index f322536c7..fb102e699 100644
--- a/src/DataViews/_RepositoryView.py
+++ b/src/DataViews/_RepositoryView.py
@@ -44,7 +44,6 @@ import DisplayModels
 import Utils
 import Bookmarks
 import Errors
-import const
 import Config
 from Editors import EditRepository, DelRepositoryQuery
 from DdTargets import DdTargets
diff --git a/src/DataViews/_SourceView.py b/src/DataViews/_SourceView.py
index b3c7e7cb2..126d41255 100644
--- a/src/DataViews/_SourceView.py
+++ b/src/DataViews/_SourceView.py
@@ -39,7 +39,6 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import RelLib
-import const
 import Config
 import PageView
 import DisplayModels
diff --git a/src/DbLoader.py b/src/DbLoader.py
index d36833d76..1479c230c 100644
--- a/src/DbLoader.py
+++ b/src/DbLoader.py
@@ -54,6 +54,7 @@ import GrampsDb
 import Utils
 from PluginUtils import import_list
 import QuestionDialog
+from Errors import GrampsDbException
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py
index 9219801b0..ee17e75b1 100644
--- a/src/GrampsWidgets.py
+++ b/src/GrampsWidgets.py
@@ -54,7 +54,6 @@ import pango
 #
 #-------------------------------------------------------------------------
 import AutoComp
-import DateHandler
 import DateEdit
 import const
 import Config
@@ -613,7 +612,7 @@ class PlaceEntry:
             try:
                 EditPlace(self.dbstate, self.uistate, self.track,
                           place, self.place_added)
-            except Errors.WindowActiveError:
+            except WindowActiveError:
                 pass
 
     def drag_data_received(self, widget, context, x, y, selection, info, time):
@@ -635,7 +634,7 @@ class PlaceEntry:
             try:
                 EditPlace(self.dbstate, self.uistate, self.track, place,
                           self.after_edit)
-            except Errors.WindowActiveError:
+            except WindowActiveError:
                 pass
         else:
             from Selectors import selector_factory