diff --git a/src/calibre/gui2/dialogs/search.py b/src/calibre/gui2/dialogs/search.py
index 6faca647bb..4d66978ba2 100644
--- a/src/calibre/gui2/dialogs/search.py
+++ b/src/calibre/gui2/dialogs/search.py
@@ -13,10 +13,11 @@ class SearchItem(Ui_Form, QWidget):
     FIELDS = {
               _('Title')     : 'title:',
               _('Author')    : 'author:',
-              _('Publisher') :'publisher:',
-              _('Tag')       :'tag',
-              _('Series')    :'series:',
-              _('Format')    :'format:',
+              _('Publisher') : 'publisher:',
+              _('Tag')       : 'tag:',
+              _('Series')    : 'series:',
+              _('Format')    : 'format:',
+              _('Comments')  : 'comments:',
               _('Any')       :''
               }
     
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 264b26ab93..466790c733 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -1056,11 +1056,14 @@ class Main(MainWindow, Ui_MainWindow):
             self.device_error_dialog.show()
             
     def conversion_job_exception(self, id, description, exception, formatted_traceback, log):
-        print >>sys.stderr, 'Error in job:', description.encode('utf8')
-        if log:
-            print >>sys.stderr, log.encode('utf8', 'ignore') if isinstance(log, unicode) else log
-        print >>sys.stderr, exception
-        print >>sys.stderr, formatted_traceback.encode('utf8', 'ignore') if isinstance(formatted_traceback, unicode) else formatted_traceback
+        try:
+            print >>sys.stderr, 'Error in job:', description.encode('utf8')
+            if log:
+                print >>sys.stderr, log.encode('utf8', 'ignore') if isinstance(log, unicode) else log
+            print >>sys.stderr, exception
+            print >>sys.stderr, formatted_traceback.encode('utf8', 'ignore') if isinstance(formatted_traceback, unicode) else formatted_traceback
+        except:
+            pass
         msg =  u'<p><b>%s</b>: %s</p>'%exception
         msg += u'<p>Failed to perform <b>job</b>: '+description
         msg += u'<p>Detailed <b>traceback</b>:<pre>'