diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 655ced05c..e0346a98a 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -18,6 +18,8 @@
 	* src/EditPlace.py, src/EditSource.py: Detect new objects by
 	handle.
 	* src/const.py.in (save_frel): Return English strings.
+	* src/plugins/FamilyGroup.py (parse_user_options): Only select
+	spouse if there is any.
 
 2005-06-03  Jens Arvidsson <jya@sverige.nu>
 	* src/po/sv.po: Minor fixes found via pochkpyvar.pl.
diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py
index 6dbfe3e43..ff8010442 100644
--- a/gramps2/src/plugins/FamilyGroup.py
+++ b/gramps2/src/plugins/FamilyGroup.py
@@ -486,7 +486,8 @@ class FamilyGroupOptions(ReportOptions.ReportOptions):
         """
         spouses = self.get_spouses(dialog.db,dialog.person)
         spouse_index = self.spouse_menu.get_active()
-        self.options_dict['spouse_id'] = spouses[spouse_index][0]
+        if spouses:
+            self.options_dict['spouse_id'] = spouses[spouse_index][0]
 
     def make_default_style(self,default_style):
         """Make default output style for the Family Group Report."""