diff --git a/oxdata/lookup/models.py b/oxdata/lookup/models.py
index ff539b2..461d481 100644
--- a/oxdata/lookup/models.py
+++ b/oxdata/lookup/models.py
@@ -22,7 +22,7 @@ def oxdb_sortnames(names):
     try:
         sort_names = oxdb_api.sortName(names=names)['data'].values()
     except:
-        sort_names = map(canonical_name, names)
+        sort_names = list(map(canonical_name, names))
     return sort_names
 
 def get_movie_id(imdb_id):
diff --git a/oxdata/movie/models.py b/oxdata/movie/models.py
index c08452b..b7263fc 100644
--- a/oxdata/movie/models.py
+++ b/oxdata/movie/models.py
@@ -122,9 +122,9 @@ class Imdb(models.Model):
                     if isinstance(value, string_types):
                         value = normalize_value(value)
                     setattr(self, key, value)
-            if self.season < 0:
+            if self.season and self.season < 0:
                 self.season = None
-            if self.episode < 0:
+            if self.episode and self.episode < 0:
                 self.episode = None
             self.save()
         elif not self.invalid: