diff --git a/resources/recipes/nytimes_sub.recipe b/resources/recipes/nytimes_sub.recipe
index 78f6016c94..93df08220d 100644
--- a/resources/recipes/nytimes_sub.recipe
+++ b/resources/recipes/nytimes_sub.recipe
@@ -57,9 +57,9 @@ class NYTimes(BasicNewsRecipe):
     remove_tags_after  = dict(id='article')
     remove_tags = [dict(attrs={'class':[
                             'articleFooter',
-                            'articleInline runaroundLeft',
                             'articleTools',
                             'columnGroup doubleRule',
+                            'columnGroup singleRule',
                             'columnGroup last',
                             'columnGroup  last',
                             'doubleRule',
@@ -68,6 +68,7 @@ class NYTimes(BasicNewsRecipe):
                             'icon enlargeThis',
                             'leftNavTabs',
                             'module box nav',
+                            'nextArticleLink',
                             'nextArticleLink clearfix',
                             'post-tools',
                             'relatedSearchesModule',
@@ -226,7 +227,7 @@ class NYTimes(BasicNewsRecipe):
 
             if div['class'] == 'section-headline':
                 key = string.capwords(feed_title(div))
-                if len(self.excludeSectionKeywords):
+                if self.excludeSectionKeywords:
                     excluded = re.compile('|'.join(self.excludeSectionKeywords))
                     if excluded.search(key):
                         self.log("Skipping section %s" % key)
diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py
index 5d759be47c..448965a913 100644
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@@ -150,7 +150,8 @@ class PRS505(CLI, Device):
         for location in locations:
             info = metadata.next()
             path = location[0]
-            blist = 2 if location[3] == 'cardb' else 1 if location[3] == 'carda' else 0
+            oncard = location[3]
+            blist = 2 if oncard == 'cardb' else 1 if oncard == 'carda' else 0
 
             if self._main_prefix and path.startswith(self._main_prefix):
                 name = path.replace(self._main_prefix, '')
@@ -166,7 +167,11 @@ class PRS505(CLI, Device):
 
             opts = self.settings()
             collections = opts.extra_customization.split(',') if opts.extra_customization else []
-            booklists[blist].add_book(info, name, collections, *location[1:-1])
+            booklist = booklists[blist]
+            if not hasattr(booklist, 'add_book'):
+                raise ValueError(('Incorrect upload location %s. Did you choose the'
+                        ' correct card A or B, to send books to?')%oncard)
+            booklist.add_book(info, name, collections, *location[1:-1])
         fix_ids(*booklists)
 
     def delete_books(self, paths, end_session=True):