diff --git a/resources/jacket/stylesheet.css b/resources/jacket/stylesheet.css
index c45f8fe977..56bef24ac2 100644
--- a/resources/jacket/stylesheet.css
+++ b/resources/jacket/stylesheet.css
@@ -113,8 +113,8 @@ table.cbj_header tr.cbj_series {
 	/* display:none; */
 	}
 
-table.cbj_header tr.cbj_pubdate {
-	/* Uncomment the next line to remove 'Published' from banner section */
+table.cbj_header tr.cbj_pubdata {
+	/* Uncomment the next line to remove 'Published (year of publication)' from banner section */
 	/* display:none; */
 	}
 
diff --git a/src/calibre/ebooks/oeb/transforms/jacket.py b/src/calibre/ebooks/oeb/transforms/jacket.py
index 84f2dd5d6a..fe0d60de7a 100644
--- a/src/calibre/ebooks/oeb/transforms/jacket.py
+++ b/src/calibre/ebooks/oeb/transforms/jacket.py
@@ -109,7 +109,7 @@ def get_rating(rating, rchar, e_rchar):
 
 def render_jacket(mi, output_profile,
         alt_title=_('Unknown'), alt_tags=[], alt_comments='',
-        alt_publisher=('Unknown publisher')):
+        alt_publisher=('')):
     css = P('jacket/stylesheet.css', data=True).decode('utf-8')
 
     try:
@@ -127,7 +127,7 @@ def render_jacket(mi, output_profile,
     try:
         publisher = mi.publisher if mi.publisher else alt_publisher
     except:
-        publisher = _('Unknown publisher')
+        publisher = ''
 
     try:
         pubdate = strftime(u'%Y', mi.pubdate.timetuple())
diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index 23127035d2..cb55b2318d 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -4442,46 +4442,39 @@ then rebuild the catalog.\n''').format(author[0],author[1],current_author[1])
 
             # Insert the link to the series or remove <a class="series">
             aTag = body.find('a', attrs={'class':'series_id'})
-            if book['series']:
-                if self.opts.generate_series:
-                    aTag['href'] = "%s.html#%s_series" % ('BySeries',
-                                    re.sub('\W','',book['series']).lower())
-            else:
-                aTag.extract()
+            if aTag:
+                if book['series']:
+                    if self.opts.generate_series:
+                        aTag['href'] = "%s.html#%s_series" % ('BySeries',
+                                        re.sub('\W','',book['series']).lower())
+                else:
+                    aTag.extract()
 
-            # Insert the author link (always)
+            # Insert the author link
             aTag = body.find('a', attrs={'class':'author'})
-            if self.opts.generate_authors:
+            if self.opts.generate_authors and aTag:
                 aTag['href'] = "%s.html#%s" % ("ByAlphaAuthor",
                                             self.generateAuthorAnchor(book['author']))
 
             if publisher == ' ':
-                try:
-                    publisherTag = body.find('td', attrs={'class':'publisher'})
+                publisherTag = body.find('td', attrs={'class':'publisher'})
+                if publisherTag:
                     publisherTag.contents[0].replaceWith('&nbsp;')
-                except:
-                    pass
 
             if not genres:
-                try:
-                    genresTag = body.find('p',attrs={'class':'genres'})
+                genresTag = body.find('p',attrs={'class':'genres'})
+                if genresTag:
                     genresTag.extract()
-                except:
-                    pass
 
             if not formats:
-                try:
-                    formatsTag = body.find('p',attrs={'class':'formats'})
+                formatsTag = body.find('p',attrs={'class':'formats'})
+                if formatsTag:
                     formatsTag.extract()
-                except:
-                    pass
 
             if note_content == '':
-                try:
-                    tdTag = body.find('td', attrs={'class':'notes'})
+                tdTag = body.find('td', attrs={'class':'notes'})
+                if tdTag:
                     tdTag.contents[0].replaceWith('&nbsp;')
-                except:
-                    pass
 
             emptyTags = body.findAll('td', attrs={'class':'empty'})
             for mt in emptyTags: