1 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index dbda4a243..dcee4bae7 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1394,11 +1394,12 @@ namespace MediaBrowser.Controller.Entities
         {
             if (type == ImageType.Backdrop)
             {
-                throw new ArgumentException("Backdrops should be accessed using Item.Backdrops");
+                return BackdropImagePaths.Count > imageIndex;
             }
             if (type == ImageType.Screenshot)
             {
-                throw new ArgumentException("Screenshots should be accessed using Item.Screenshots");
+                var hasScreenshots = this as IHasScreenshots;
+                return hasScreenshots != null && hasScreenshots.ScreenshotImagePaths.Count > imageIndex;
             }
 
             return !string.IsNullOrEmpty(this.GetImagePath(type));