diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 09f3af688..becf69064 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,7 @@
 2006-07-18  Alex Roitman  <shura@gramps-project.org>
+	* src/ArgHandler.py (ArgHandler.cl_export): Properly expand filename.
+	* src/GrampsDb/_WriteGrdb.py (exportData): Use placeholder if
+	callback is None.
 	* src/GrampsDb/_GrampsBSDDB.py
 	(_delete_primary_from_reference_map): defer deleting until the
 	cursor is closed.
diff --git a/gramps2/src/ArgHandler.py b/gramps2/src/ArgHandler.py
index 3be99cbeb..af54b2f2a 100644
--- a/gramps2/src/ArgHandler.py
+++ b/gramps2/src/ArgHandler.py
@@ -543,6 +543,7 @@ class ArgHandler:
         Try to write into filename using the format.
         Any errors will cause the os._exit(1) call.
         """
+        filename = os.path.abspath(os.path.expanduser(filename))
         if format == 'grdb':
             try:
                 GrampsDb.gramps_db_writer_factory(const.app_gramps)(
diff --git a/gramps2/src/GrampsDb/_WriteGrdb.py b/gramps2/src/GrampsDb/_WriteGrdb.py
index 5151d282c..16cc63692 100644
--- a/gramps2/src/GrampsDb/_WriteGrdb.py
+++ b/gramps2/src/GrampsDb/_WriteGrdb.py
@@ -44,8 +44,14 @@ from _DbUtils import db_copy
 # Importing data into the currently open database. 
 #
 #-------------------------------------------------------------------------
+def cli_callback(val):
+    pass
+
 def exportData(database, filename, person=None, callback=None, cl=False):
     
+    if callback == None:
+        callback = cli_callback
+
     filename = os.path.normpath(filename)
     new_database = GrampsBSDDB()
     try: