...

src/calibre/gui2/preferences/toolbar.py

@@ -37,7 +37,10 @@ class BaseModel(QAbstractListModel):
                     dont_remove_from=set(['toolbar-device']))
         if name is None:
             return FakeAction('--- '+_('Separator')+' ---', None)
+        try:
             return gui.iactions[name]
+        except:
+            return None
 
     def rowCount(self, parent):
         return len(self._data)
@@ -125,6 +128,7 @@ class CurrentModel(BaseModel):
         self.gprefs_name = 'action-layout-'+key
         current = gprefs[self.gprefs_name]
         self._data = [self.name_to_action(x, gui) for x in current]
+        self._data = [x for x in self._data if x is not None]
         self.key = key
         self.gui = gui