diff --git a/account_ebics/models/ebics_file_format.py b/account_ebics/models/ebics_file_format.py
index a4f4081..c3b8d7e 100644
--- a/account_ebics/models/ebics_file_format.py
+++ b/account_ebics/models/ebics_file_format.py
@@ -114,5 +114,7 @@ class EbicsFileFormat(models.Model):
         res = []
         for rec in self:
             name = rec.ebics_version == "2" and rec.name or rec.btf_message
+            if rec.description:
+                name += " - " + rec.description
             res.append((rec.id, name))
         return res
diff --git a/account_ebics/wizards/ebics_xfer.py b/account_ebics/wizards/ebics_xfer.py
index c914cbf..5bc4a70 100644
--- a/account_ebics/wizards/ebics_xfer.py
+++ b/account_ebics/wizards/ebics_xfer.py
@@ -152,7 +152,7 @@ class EbicsXfer(models.TransientModel):
             )
             if len(upload_formats) > 1:
                 upload_formats = upload_formats.filtered(
-                    lambda r: self.upload_fname.endswith(r.suffix)
+                    lambda r: self.upload_fname.endswith(r.suffix or "")
                 )
             if len(upload_formats) == 1:
                 self.format_id = upload_formats