diff --git a/ChangeLog b/ChangeLog
index ce232f253..e50db76a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-06  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/PluginUtils/_Plugins.py: ignore pressing apply without
+	a plugin being selected
+	* src/plugins/SoundGen.py: Dont fail with empty database
+
 2006-10-06  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_GrampsBSDDB.py (GrampsBSDDB.load): Do not create
 	logs when TXN is disabled.
diff --git a/src/PluginUtils/_Plugins.py b/src/PluginUtils/_Plugins.py
index 04f9d6900..84eb3eb2b 100644
--- a/src/PluginUtils/_Plugins.py
+++ b/src/PluginUtils/_Plugins.py
@@ -144,17 +144,19 @@ class PluginDialog(ManagedWindow.ManagedWindow):
 
     def on_apply_clicked(self,obj):
         """Execute the selected report"""
-
-        (item_class,options_class,title,category,
-         name,require_active) = self.item
-        if self.content == REPORTS:
-            report(self.state,self.uistate,self.state.active,
-                   item_class,options_class,title,name,category,require_active)
-        else:
-            _Tool.gui_tool(self.state,self.uistate, 
-                          item_class,options_class,title,name,category,
-                          self.state.db.request_rebuild)
-
+        try:
+            (item_class,options_class,title,category,
+             name,require_active) = self.item
+            if self.content == REPORTS:
+                report(self.state,self.uistate,self.state.active,
+                       item_class,options_class,title,name,category,require_active)
+            else:
+                _Tool.gui_tool(self.state,self.uistate, 
+                              item_class,options_class,title,name,category,
+                              self.state.db.request_rebuild)
+        except TypeError:
+            pass # ignore pressing apply without a plugin being selected
+        
     def on_node_selected(self,obj):
         """Updates the informational display on the right hand side of
         the dialog box with the description of the selected report"""
diff --git a/src/plugins/SoundGen.py b/src/plugins/SoundGen.py
index be3544dc2..3343f7a9b 100644
--- a/src/plugins/SoundGen.py
+++ b/src/plugins/SoundGen.py
@@ -79,6 +79,7 @@ class SoundGen(Tool.Tool, ManagedWindow.ManagedWindow):
         self.name.connect('changed',self.on_apply_clicked)
 
         names = []
+        person = None
         for person_handle in self.db.get_person_handles(sort_handles=False):
             person = self.db.get_person_from_handle(person_handle)
             lastname = person.get_primary_name().get_surname()