diff --git a/ChangeLog b/ChangeLog
index f9d64d884..64472a3ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-11-07 Benny Malengier <benny.malengier@gramps-project.org>
+	* src/AddMedia.py: add media crash, fix issue #1349
+
 2007-11-05 Jim Sack <jgsack@san.rr.com>
 	* src/ansel_utf8.py: fix old typo in ansel char 0xAE 
 	was U+02BE, changed to U+02BC (now same as 3.0 code)
diff --git a/src/AddMedia.py b/src/AddMedia.py
index bf7a76ff4..654d3d30c 100644
--- a/src/AddMedia.py
+++ b/src/AddMedia.py
@@ -130,6 +130,12 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
             mobj.set_handle(Utils.create_id())
             mobj.set_mime_type(None)
         else:
+            if self.file_text.get_filename() is None:
+                msgstr = _("Import failed")
+                msgstr2 = _("The filename supplied could not be found.")
+                ErrorDialog(msgstr, msgstr2)
+                return
+            
             filename = Utils.get_unicode_path(self.file_text.get_filename())
             full_file = filename