1 files changed, 10 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 227e7bdfc..6ba2ac950 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -674,14 +674,19 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 var folder = child.GetFolder();
 
-                if (folder.Id == Guid.Empty)
+                if (folder != null)
                 {
-                    folder.Id = (folder.Path ?? folder.GetType().Name).GetMBId(folder.GetType());
-                }
+                    if (folder.Id == Guid.Empty)
+                    {
+                        folder.Id = (folder.Path ?? folder.GetType().Name).GetMBId(folder.GetType());
+                    }
 
-                rootFolder.AddVirtualChild(folder);
+                    folder = GetItemById(folder.Id) as BasePluginFolder ?? folder;
 
-                RegisterItem(folder);
+                    rootFolder.AddVirtualChild(folder);
+
+                    RegisterItem(folder);
+                }
             }
 
             return rootFolder;