2 files changed, 11 insertions, 15 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 5eab1cae0..40b999b02 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -86,7 +86,7 @@ namespace MediaBrowser.Controller.Entities.TV
         {
             get
             {
-                return Season;
+                return FindParent<Season>();
             }
         }
 
@@ -179,20 +179,6 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         /// <summary>
-        /// The _season
-        /// </summary>
-        private Season _season;
-        /// <summary>
-        /// This Episode's Season Instance
-        /// </summary>
-        /// <value>The season.</value>
-        [IgnoreDataMember]
-        public Season Season
-        {
-            get { return _season ?? (_season = FindParent<Season>()); }
-        }
-
-        /// <summary>
         /// This is the ending episode number for double episodes.
         /// </summary>
         /// <value>The index number.</value>
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index f3c7b088a..b4a3fc811 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.Serialization;
 
 namespace MediaBrowser.Controller.Entities.TV
@@ -100,5 +101,14 @@ namespace MediaBrowser.Controller.Entities.TV
 
             return args;
         }
+
+        [IgnoreDataMember]
+        public bool ContainsEpisodesWithoutSeasonFolders
+        {
+            get
+            {
+                return Children.OfType<Video>().Any();
+            }
+        }
     }
 }