From f6d8c8f1cd14f4767ee6b504cdc055cd970340fa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 20 Jul 2013 10:41:36 +0530
Subject: [PATCH] ...

---
 src/calibre/gui2/library/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py
index 5705f57000..7320e36ee5 100644
--- a/src/calibre/gui2/library/models.py
+++ b/src/calibre/gui2/library/models.py
@@ -674,7 +674,7 @@ class BooksModel(QAbstractTableModel):  # {{{
                 def func(idx):
                     return by if fffunc(field_obj, idfunc(idx)) else bb
             elif dt in {'text', 'comments', 'composite', 'enumeration'}:
-                if m['is_multiple']:
+                if m['is_multiple'] and not field_obj.is_composite:
                     jv = m['is_multiple']['list_to_ui']
                     do_sort = field == 'tags'
                     if do_sort:
@@ -717,7 +717,7 @@ class BooksModel(QAbstractTableModel):  # {{{
                     if fmt:
                         try:
                             return QVariant(fmt.format(val))
-                        except (TypeError, ValueError, AttributeError, IndexError):
+                        except (TypeError, ValueError, AttributeError, IndexError, KeyError):
                             pass
                     return QVariant(val)
             else: