diff --git a/lib/tvdb_api/readme.md b/lib/tvdb_api/readme.md
index 879390e5..b0b0cfdf 100644
--- a/lib/tvdb_api/readme.md
+++ b/lib/tvdb_api/readme.md
@@ -63,7 +63,7 @@ For example, to find out what network Scrubs is aired:
 The data is stored in an attribute named `data`, within the Show instance:
 
     >>> t['scrubs'].data.keys()
-    ['networkid', 'rating', 'airs_dayofweek', 'contentrating', 'seriesname', 'id', 'airs_time', 'network', 'fanart', 'lastupdated', 'actors', 'ratingcount', 'status', 'added', 'poster', 'imdb_id', 'genre', 'banner', 'seriesid', 'language', 'zap2it_id', 'addedby', 'firstaired', 'runtime', 'overview']
+    ['networkid', 'rating', 'airs_dayofweek', 'contentrating', 'seriesname', 'id', 'airs_time', 'network', 'fanart', 'lastupdated', 'actors', 'ratingcount', 'status', 'added', 'poster', 'imdb_id', 'genre', 'banner', 'seriesid', 'language', 'zap2it_id', 'addedby', 'tms_wanted', 'firstaired', 'runtime', 'overview']
 
 Although each element is also accessible via `t['scrubs']` for ease-of-use:
 
diff --git a/lib/tvdb_api/tests/test_tvdb_api.py b/lib/tvdb_api/tests/test_tvdb_api.py
index a9483620..c1fc66b1 100644
--- a/lib/tvdb_api/tests/test_tvdb_api.py
+++ b/lib/tvdb_api/tests/test_tvdb_api.py
@@ -99,6 +99,11 @@ class test_tvdb_basic(unittest.TestCase):
             show
         )
 
+    def test_no_season(self):
+        show = self.t['Katekyo Hitman Reborn']
+        print tvdb_api
+        print show[1][1]
+
 
 class test_tvdb_errors(unittest.TestCase):
     # Used to store the cached instance of Tvdb()
diff --git a/lib/tvdb_api/tvdb_api.py b/lib/tvdb_api/tvdb_api.py
index bb503e56..36ba497a 100644
--- a/lib/tvdb_api/tvdb_api.py
+++ b/lib/tvdb_api/tvdb_api.py
@@ -96,15 +96,12 @@ class ShowContainer(dict):
 
         #keep only the 100th latest results
         if time.time() - self._lastgc > 20:
-            tbd = self._stack[:-100]
-            i = 0
-            for o in tbd:
+            for o in self._stack[:-100]:
                 del self[o]
-                del self._stack[i]
-                i += 1
 
-            _lastgc = time.time()
-            del tbd
+            self._stack = self._stack[-100:]
+
+            self._lastgc = time.time()
 
         super(ShowContainer, self).__setitem__(key, value)
 
@@ -849,11 +846,24 @@ class Tvdb:
                 use_dvd = False
 
             if use_dvd:
-                seas_no = int(cur_ep.find('DVD_season').text)
-                ep_no = int(float(cur_ep.find('DVD_episodenumber').text))
+                elem_seasnum, elem_epno = cur_ep.find('DVD_season'), cur_ep.find('DVD_episodenumber')
             else:
-                seas_no = int(cur_ep.find('SeasonNumber').text)
-                ep_no = int(cur_ep.find('EpisodeNumber').text)
+                elem_seasnum, elem_epno = cur_ep.find('SeasonNumber'), cur_ep.find('EpisodeNumber')
+
+            if elem_seasnum is None or elem_epno is None:
+
+                log().warning("An episode has incomplete season/episode number (season: %r, episode: %r)" % (
+                    elem_seasnum, elem_epno))
+                log().debug(
+                    " ".join(
+                        "%r is %r" % (child.tag, child.text) for child in cur_ep.getchildren()))
+                # TODO: Should this happen?
+                continue # Skip to next episode
+
+
+            # float() is because https://github.com/dbr/tvnamer/issues/95 - should probably be fixed in TVDB data
+            seas_no = int(float(elem_seasnum.text))
+            ep_no = int(float(elem_epno.text))
 
             useDVD = False