diff --git a/src/Errors.py b/src/Errors.py
index 66139bed4..04eaa9bf3 100644
--- a/src/Errors.py
+++ b/src/Errors.py
@@ -20,13 +20,17 @@
 
 class ReportError(Exception):
     """Error used to report Report errors"""
-    def __init__(self,value):
+    def __init__(self,value,value2=""):
         Exception.__init__(self)
         self.value = value
+        self.value2 = value2
 
     def __str__(self):
         return self.value
 
+    def messages(self):
+        return (self.value,self.value2)
+
 class GedcomError(Exception):
     """Error used to report GEDCOM errors"""
     def __init__(self,value):
diff --git a/src/QuestionDialog.py b/src/QuestionDialog.py
index af56bf8f6..a03a96724 100644
--- a/src/QuestionDialog.py
+++ b/src/QuestionDialog.py
@@ -106,9 +106,9 @@ class ErrorDialog:
         
         label1 = self.xml.get_widget('label1')
         label2 = self.xml.get_widget('label2')
-        label1.set_text('<span weight="bold" size="larger">%s</span>' % msg1)
+        label1.set_text('<span weight="bold" size="larger">%s</span>' % str(msg1))
         label1.set_use_markup(gtk.TRUE)
-        label2.set_text(msg2)
+        label2.set_text(str(msg2))
         self.top.show()
         self.top.run()
         self.top.destroy()
diff --git a/src/Report.py b/src/Report.py
index 2840b7226..901e9e383 100644
--- a/src/Report.py
+++ b/src/Report.py
@@ -451,6 +451,12 @@ class ReportDialog:
         
         self.output_notebook.set_current_page(self.notebook_page)
 
+        if not self.get_target_is_directory():
+            fname = self.target_fileentry.get_full_path(0)
+            (path,ext) = os.path.splitext(fname)
+            fname = path + obj.get_data('ext')
+            self.target_fileentry.set_filename(fname)
+
         # Does this report format use styles?
         if self.style_button:
             self.style_button.set_sensitive(obj.get_data("styles"))
diff --git a/src/docgen/AbiWordDoc.py b/src/docgen/AbiWordDoc.py
index 1a24146ee..a8b6353bd 100644
--- a/src/docgen/AbiWordDoc.py
+++ b/src/docgen/AbiWordDoc.py
@@ -63,7 +63,14 @@ class AbiWordDoc(TextDoc.TextDoc):
         else:
             self.filename = filename
 
-        self.f = open(self.filename,"w")
+        try:
+            self.f = open(self.filename,"w")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.filename)
+            
         self.f.write('<?xml version="1.0"?>\n')
         self.f.write('<!DOCTYPE abiword PUBLIC "-//ABISOURCE//DTD AWML')
         self.f.write('1.0 Strict//EN" "http://www.abisource.com/awml.dtd">\n')
diff --git a/src/docgen/HtmlDoc.py b/src/docgen/HtmlDoc.py
index 369aa680e..85802aa3e 100644
--- a/src/docgen/HtmlDoc.py
+++ b/src/docgen/HtmlDoc.py
@@ -217,7 +217,14 @@ class HtmlDoc(TextDoc.TextDoc):
 
         self.base = os.path.dirname(self.filename)
 
-        self.f = open(self.filename,"w")
+        try:
+            self.f = open(self.filename,"w")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.filename)
+
         if self.meta:
             match = t_keyword_line_re.match(self.file_header)
             if match:
@@ -319,9 +326,15 @@ class HtmlDoc(TextDoc.TextDoc):
                 if name == 'template.html':
                     continue
                 fname = '%s/%s' % (self.base,name)
-                f = open(fname, 'wb')
-                f.write(self.map[name].read())
-                f.close()
+                try:
+                    f = open(fname, 'wb')
+                    f.write(self.map[name].read())
+                    f.close()
+                except IOError,msg:
+                    errmsg = "%s\n%s" % (_("Could not create %s") % fname, msg)
+                    raise Errors.ReportError(errmsg)
+                except:
+                    raise Errors.ReportError(_("Could not create %s") % fname)
             
     def add_photo(self,name,pos,x,y):
         self.empty = 0
diff --git a/src/docgen/LaTeXDoc.py b/src/docgen/LaTeXDoc.py
index ad45b8ef7..7fff048f4 100644
--- a/src/docgen/LaTeXDoc.py
+++ b/src/docgen/LaTeXDoc.py
@@ -74,7 +74,14 @@ class LaTeXDoc(TextDoc.TextDoc):
             self.filename = filename + ".tex"
         else:
             self.filename = filename
-        self.f = open(self.filename,"w")
+
+        try:
+            self.f = open(self.filename,"w")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.filename)
 
         # Font size control seems to be limited. For now, ignore
         # any style constraints, and use 12pt has the default
diff --git a/src/docgen/OpenDrawDoc.py b/src/docgen/OpenDrawDoc.py
index 174ef5b73..de76eaf80 100644
--- a/src/docgen/OpenDrawDoc.py
+++ b/src/docgen/OpenDrawDoc.py
@@ -72,6 +72,9 @@ class OpenDrawDoc(DrawDoc.DrawDoc):
         try:
             self.content_xml = tempfile.mktemp()
             self.f = open(self.content_xml,"wb")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg)
+            raise Errors.ReportError(errmsg)
         except:
             raise Errors.ReportError("Could not create %s" % self.filename)
 
diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py
index 640b9a5f9..2f570dadc 100644
--- a/src/docgen/OpenOfficeDoc.py
+++ b/src/docgen/OpenOfficeDoc.py
@@ -77,8 +77,11 @@ class OpenOfficeDoc(TextDoc.TextDoc):
         try:
             self.content_xml = tempfile.mktemp()
             self.f = open(self.content_xml,"wb")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.content_xml, msg)
+            raise Errors.ReportError(errmsg)
         except:
-            raise Errors.ReportError("Could not create %s" % self.filename)
+            raise Errors.ReportError("Could not create %s" % self.content_xml)
 
         self.f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
         self.f.write('<office:document-content ')
@@ -333,7 +336,14 @@ class OpenOfficeDoc(TextDoc.TextDoc):
         
     def _write_styles_file(self):
         self.styles_xml = tempfile.mktemp()
-	self.f = open(self.styles_xml,"wb")
+
+        try:
+            self.f = open(self.styles_xml,"wb")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.styles_xml, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError((_("Could not create %s") % self.styles_xml)
         
         self.f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
         self.f.write('<office:document-styles ')
@@ -505,7 +515,15 @@ class OpenOfficeDoc(TextDoc.TextDoc):
 
     def _write_manifest(self):
         self.manifest_xml = tempfile.mktemp()
-	self.f = open(self.manifest_xml,"wb")
+
+        try:
+            self.f = open(self.manifest_xml,"wb")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.manifest_xml, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.manifest_xml)
+
 	self.f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
 	self.f.write('<manifest:manifest ')
         self.f.write('xmlns:manifest="http://openoffice.org/2001/manifest">')
@@ -533,7 +551,15 @@ class OpenOfficeDoc(TextDoc.TextDoc):
     def _write_meta_file(self):
         name = self.name
         self.meta_xml = tempfile.mktemp()
-	self.f = open(self.meta_xml,"wb")
+
+        try:
+            self.f = open(self.meta_xml,"wb")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.meta_xml, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.meta_xml)
+
 	self.f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
 	self.f.write('<office:document-meta ')
 	self.f.write('xmlns:office="http://openoffice.org/2000/office" ')
diff --git a/src/docgen/PSDrawDoc.py b/src/docgen/PSDrawDoc.py
index 6550e42b8..867ec02bc 100644
--- a/src/docgen/PSDrawDoc.py
+++ b/src/docgen/PSDrawDoc.py
@@ -74,7 +74,13 @@ class PSDrawDoc(DrawDoc.DrawDoc):
         else:
             self.filename = filename
 
-        self.f = open(self.filename,"w")
+        try:
+            self.f = open(self.filename,"w")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.filename)
         
         self.f.write('%!PS-Adobe-3.0\n')
         self.f.write('%%LanguageLevel: 2\n')
diff --git a/src/docgen/PdfDoc.py b/src/docgen/PdfDoc.py
index 8f1609c52..97137dea8 100644
--- a/src/docgen/PdfDoc.py
+++ b/src/docgen/PdfDoc.py
@@ -150,7 +150,13 @@ class PdfDoc(TextDoc.TextDoc):
 	self.in_table = 0
 
     def close(self):
-        self.doc.build(self.story)
+        try:
+            self.doc.build(self.story)
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.filename)
 
     def end_page(self):
         self.story.append(PageBreak())
diff --git a/src/docgen/PdfDrawDoc.py b/src/docgen/PdfDrawDoc.py
index ebecc2ce2..1655b9707 100644
--- a/src/docgen/PdfDrawDoc.py
+++ b/src/docgen/PdfDrawDoc.py
@@ -78,7 +78,12 @@ class PdfDrawDoc(DrawDoc.DrawDoc):
 	    self.f.setAuthor(self.name)
 
     def close(self):
-	self.f.save()
+        try:
+            self.f.save()
+        except IOError,msg:
+            raise Errors.ReportError(_("Could not create %s") % self.filename,msg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.filename)
 
     def start_paragraph(self,style_name):
 	pass
diff --git a/src/docgen/RTFDoc.py b/src/docgen/RTFDoc.py
index bd0047702..a202f382f 100644
--- a/src/docgen/RTFDoc.py
+++ b/src/docgen/RTFDoc.py
@@ -64,7 +64,14 @@ class RTFDoc(TextDoc.TextDoc):
         else:
             self.filename = filename
 
-        self.f = open(self.filename,"w")
+        try:
+            self.f = open(self.filename,"w")
+        except IOError,msg:
+            errmsg = "%s\n%s" % (_("Could not create %s") % self.filename, msg)
+            raise Errors.ReportError(errmsg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % self.filename)
+
         self.f.write('{\\rtf1\\ansi\\ansicpg1252\\deff0\n')
         self.f.write('{\\fonttbl\n')
         self.f.write('{\\f0\\froman\\fcharset0\\fprq0 Times New Roman;}\n')
diff --git a/src/docgen/SvgDrawDoc.py b/src/docgen/SvgDrawDoc.py
index 759a6c353..a9c4e055c 100644
--- a/src/docgen/SvgDrawDoc.py
+++ b/src/docgen/SvgDrawDoc.py
@@ -34,6 +34,7 @@ import Plugins
 from intl import gettext as _
 import TextDoc
 import DrawDoc
+import Errors
 
 #-------------------------------------------------------------------------
 #
@@ -74,7 +75,13 @@ class SvgDrawDoc(DrawDoc.DrawDoc):
             name = "%s-%d.svg" % (self.root,self.page)
         else:
             name = "%s.svg" % self.root
-        self.f = open(name,"w")
+
+        try:
+            self.f = open(name,"w")
+        except IOError,msg:
+            raise Errors.ReportError(_("Could not create %s") % name, msg)
+        except:
+            raise Errors.ReportError(_("Could not create %s") % name)
             
         self.f.write('<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n')
         self.f.write('<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" ')
diff --git a/src/plugins/AncestorChart.py b/src/plugins/AncestorChart.py
index 2cf27c6d9..cb8e72dc6 100644
--- a/src/plugins/AncestorChart.py
+++ b/src/plugins/AncestorChart.py
@@ -126,11 +126,7 @@ class AncestorChart:
                     self.print_page(index, generation, page)
                     page = page + 1
             generation = generation + 3
-	try:
-            self.doc.close()
-        except:
-            import DisplayTrace
-            DisplayTrace.DisplayTrace()
+        self.doc.close()
 
     def calc(self):
         """
@@ -259,7 +255,8 @@ class AncestorChartDialog(Report.DrawReportDialog):
                                      self.max_gen, self.doc, self.report_text)
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/AncestorReport.py b/src/plugins/AncestorReport.py
index 2a269a2ad..b72222cf5 100644
--- a/src/plugins/AncestorReport.py
+++ b/src/plugins/AncestorReport.py
@@ -271,7 +271,8 @@ class AncestorReportDialog(Report.TextReportDialog):
                                       self.max_gen, self.doc, self.pg_brk)
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/DesGraph.py b/src/plugins/DesGraph.py
index 1818500bf..13320a3b8 100644
--- a/src/plugins/DesGraph.py
+++ b/src/plugins/DesGraph.py
@@ -344,7 +344,8 @@ class DescendantReportDialog(Report.DrawReportDialog):
                                         self.person, self.target_path, self.doc)
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/DescendReport.py b/src/plugins/DescendReport.py
index f7c655a92..321cd9711 100644
--- a/src/plugins/DescendReport.py
+++ b/src/plugins/DescendReport.py
@@ -167,7 +167,8 @@ class DescendantReportDialog(Report.TextReportDialog):
             MyReport.report()
             MyReport.end()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py
index 5bb34c925..e30a917e8 100644
--- a/src/plugins/DetAncestralReport.py
+++ b/src/plugins/DetAncestralReport.py
@@ -760,7 +760,8 @@ class DetAncestorReportDialog(TextReportDialog):
             
             MyReport.write_report(rptOpt)
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/FamilyGroup.py b/src/plugins/FamilyGroup.py
index 998ff61a0..c12187097 100644
--- a/src/plugins/FamilyGroup.py
+++ b/src/plugins/FamilyGroup.py
@@ -449,7 +449,8 @@ class FamilyGroupDialog(Report.TextReportDialog):
             MyReport.setup()
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/FtmStyleAncestors.py b/src/plugins/FtmStyleAncestors.py
index 6518cd2be..3bc37e861 100644
--- a/src/plugins/FtmStyleAncestors.py
+++ b/src/plugins/FtmStyleAncestors.py
@@ -759,7 +759,8 @@ class FtmAncestorReportDialog(Report.TextReportDialog):
                                       self.max_gen, self.doc, self.pg_brk)
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/FtmStyleDescendants.py b/src/plugins/FtmStyleDescendants.py
index f8b692105..954bb7392 100644
--- a/src/plugins/FtmStyleDescendants.py
+++ b/src/plugins/FtmStyleDescendants.py
@@ -1153,7 +1153,8 @@ class FtmDescendantReportDialog(Report.TextReportDialog):
                                       self.max_gen, self.doc, self.pg_brk)
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py
index 0ba8adcdf..114413d4b 100644
--- a/src/plugins/IndivComplete.py
+++ b/src/plugins/IndivComplete.py
@@ -544,7 +544,8 @@ class IndivSummaryDialog(Report.TextReportDialog):
             MyReport.setup()
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/IndivSummary.py b/src/plugins/IndivSummary.py
index b47002604..b86a68523 100644
--- a/src/plugins/IndivSummary.py
+++ b/src/plugins/IndivSummary.py
@@ -384,7 +384,8 @@ class IndivSummaryDialog(Report.TextReportDialog):
             MyReport.setup()
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
diff --git a/src/plugins/ReadGedcom.py b/src/plugins/ReadGedcom.py
index f32bb20f5..f6fca1edc 100644
--- a/src/plugins/ReadGedcom.py
+++ b/src/plugins/ReadGedcom.py
@@ -141,7 +141,7 @@ def importData(database, filename, cb=None):
         g = GedcomParser(database,filename,statusTop)
     except IOError,msg:
         Utils.destroy_passed_object(statusWindow)
-        ErrorDialog(_("%s could not be opened\n") % filename + str(msg))
+        ErrorDialog(_("%s could not be opened\n") % filename,str(msg))
         return
     except:
         Utils.destroy_passed_object(statusWindow)
@@ -154,12 +154,12 @@ def importData(database, filename, cb=None):
     except IOError,msg:
         Utils.destroy_passed_object(statusWindow)
         errmsg = _("%s could not be opened\n") % filename
-        ErrorDialog(errmsg + str(msg))
+        ErrorDialog(errmsg,str(msg))
         return
     except Errors.GedcomError, val:
-        msg = str(val)
+        (m1,m2) = val.messages()
         Utils.destroy_passed_object(statusWindow)
-        ErrorDialog(msg)
+        ErrorDialog(m1,m2)
         return
     except:
         import DisplayTrace
diff --git a/src/plugins/TimeLine.py b/src/plugins/TimeLine.py
index 79600f8c8..22f61e5a5 100644
--- a/src/plugins/TimeLine.py
+++ b/src/plugins/TimeLine.py
@@ -410,7 +410,8 @@ class TimeLineDialog(Report.DrawReportDialog):
 	    MyReport.setup()
             MyReport.write_report()
         except Errors.ReportError, msg:
-            ErrorDialog(str(msg))
+            (m1,m2) = msg.messages()
+            ErrorDialog(m1,m2)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()