diff --git a/src/NzbDrone.Core/MetadataSource/TvDbProxy.cs b/src/NzbDrone.Core/MetadataSource/TvDbProxy.cs
index 784be099c..8c0498120 100644
--- a/src/NzbDrone.Core/MetadataSource/TvDbProxy.cs
+++ b/src/NzbDrone.Core/MetadataSource/TvDbProxy.cs
@@ -142,9 +142,20 @@ namespace NzbDrone.Core.MetadataSource
             series.Actors = new List<Tv.Actor>();
             series.Seasons = GetSeasons(show);
 
-            series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = show.Banner.ToString() });
-            series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = show.Poster.ToString() });
-            series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = show.Fanart.ToString() });
+            if (show.Banner != null)
+            {
+                series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = show.Banner.ToString() });                
+            }
+
+            if (show.Poster != null)
+            {
+                series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = show.Poster.ToString() });
+            }
+
+            if (show.Fanart != null)
+            {
+                series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = show.Fanart.ToString() });
+            }
 
             return series;
         }
@@ -166,8 +177,11 @@ namespace NzbDrone.Core.MetadataSource
             episode.Ratings = GetRatings(traktEpisode.RatingCount, traktEpisode.Rating);
 
             //Don't include series fanart images as episode screenshot
-            episode.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Screenshot, traktEpisode.EpisodeImage.ToString()));
-
+            if (traktEpisode.EpisodeImage != null)
+            {
+                episode.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Screenshot, traktEpisode.EpisodeImage.ToString()));                
+            }
+            
             return episode;
         }
 
diff --git a/src/TVDBSharp/Models/Builder.cs b/src/TVDBSharp/Models/Builder.cs
index c8d2d02fd..74f633174 100644
--- a/src/TVDBSharp/Models/Builder.cs
+++ b/src/TVDBSharp/Models/Builder.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Xml.Linq;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using TVDBSharp.Models.DAO;
 using TVDBSharp.Models.Enums;
@@ -82,6 +83,11 @@ namespace TVDBSharp.Models
 
         private static Uri GetBannerUri(string uriSuffix)
         {
+            if (uriSuffix.IsNullOrWhiteSpace())
+            {
+                return null;
+            }
+
             return new Uri(UriPrefix + uriSuffix, UriKind.Absolute);
         }