add custom collection sort orders to edit page

1 files changed, 9 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 19cad7948..8ca475650 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -238,7 +238,7 @@ namespace MediaBrowser.Controller.Entities
 
                 if (string.IsNullOrEmpty(parentPath))
                 {
-                    throw new ApplicationException("Unable to get parent path info from " + path);
+                    throw new IOException("Unable to get parent path info from " + path);
                 }
 
                 files = new DirectoryInfo(parentPath)
@@ -247,7 +247,14 @@ namespace MediaBrowser.Controller.Entities
             }
             else
             {
-                files = ResolveArgs.FileSystemChildren.Where(i =>
+                var resolveArgs = ResolveArgs;
+
+                if (resolveArgs == null)
+                {
+                    throw new IOException("ResolveArgs are null for " + path);
+                }
+
+                files = resolveArgs.FileSystemChildren.Where(i =>
                 {
                     if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
                     {