Merge branch 'refs/heads/develop' into desktop

couchpotato/core/plugins/scanner/main.py

@@ -280,6 +280,8 @@ class Scanner(Plugin):
                 group['files']['movie'] = self.getDVDFiles(group['unsorted_files'])
             else:
                 group['files']['movie'] = self.getMediaFiles(group['unsorted_files'])
+
+            log.debug('Getting metadata for %s' % identifier)
             group['meta_data'] = self.getMetaData(group)
 
             # Get parent dir from movie files

couchpotato/core/providers/movie/imdbapi/main.py

@@ -68,7 +68,7 @@ class IMDBAPI(MovieProvider):
                 'released': movie.get('Released', ''),
                 'year': movie.get('Year', ''),
                 'plot': movie.get('Plot', ''),
-                'genres': movie.get('Genre').split(','),
+                'genres': movie.get('Genre', '').split(','),
                 'directors': movie.get('Director', '').split(','),
                 'writers': movie.get('Writer', '').split(','),
                 'actors': movie.get('Actors', '').split(','),