diff --git a/src/internal/movies/movies.go b/src/internal/movies/movies.go
index 29114d9..e08925c 100644
--- a/src/internal/movies/movies.go
+++ b/src/internal/movies/movies.go
@@ -64,6 +64,10 @@ type MovieDB struct {
 // NewMovieDB returns a Movie ready to be put in DB from a
 // Movie
 func NewMovieDB(m *Movie) MovieDB {
+	genres := []string{}
+	if m.Genres != nil {
+		genres = m.Genres
+	}
 	return MovieDB{
 		ID:            m.ID,
 		ImdbID:        m.ImdbID,
@@ -77,7 +81,7 @@ func NewMovieDB(m *Movie) MovieDB {
 		Runtime:       m.Runtime,
 		SortTitle:     m.SortTitle,
 		Tagline:       m.Tagline,
-		Genres:        m.Genres,
+		Genres:        genres,
 		Created:       m.Created,
 		Updated:       m.Updated,
 	}
diff --git a/src/internal/shows/shows.go b/src/internal/shows/shows.go
index cecf755..a3503b4 100644
--- a/src/internal/shows/shows.go
+++ b/src/internal/shows/shows.go
@@ -257,15 +257,15 @@ func (s *Show) GetPosterURL(env *web.Env) string {
 // downloadImages will download the show images
 func (s *Show) downloadImages(env *web.Env) {
 	// Download the banner
-	err := web.Download(s.Show.Banner, s.imgURL(env, "banner"))
+	err := web.Download(s.Show.Banner, s.imgFile(env, "banner"))
 	if err != nil {
 		env.Log.Errorf("failed to dowload banner: %s", err)
 	}
-	err = web.Download(s.Show.Fanart, s.imgURL(env, "fanart"))
+	err = web.Download(s.Show.Fanart, s.imgFile(env, "fanart"))
 	if err != nil {
 		env.Log.Errorf("failed to dowload fanart: %s", err)
 	}
-	err = web.Download(s.Show.Poster, s.imgURL(env, "poster"))
+	err = web.Download(s.Show.Poster, s.imgFile(env, "poster"))
 	if err != nil {
 		env.Log.Errorf("failed to dowload poster: %s", err)
 	}