Merge pull request #4545 from BaronGreenback/17.0RC0---Fix1

[Fix] Null Pointer in TmdbMovieProvider

1 files changed, 5 insertions, 1 deletions

diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
index 3984e4953..bcf9459ef 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
@@ -129,6 +129,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 .GetMovieAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
                 .ConfigureAwait(false);
 
+            if (movieResult == null)
+            {
+                return new MetadataResult<Movie>();
+            }
+
             var movie = new Movie
             {
                 Name = movieResult.Title ?? movieResult.OriginalTitle,
@@ -266,7 +271,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 }
             }
 
-
             if (movieResult.Videos?.Results != null)
             {
                 var trailers = new List<MediaUrl>();