diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 843e39f784..f3d5824da2 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -1,6 +1,7 @@
using MediaBrowser.Common;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
using ServiceStack;
using System;
using System.Collections.Generic;
@@ -67,7 +68,27 @@ namespace MediaBrowser.Api.Library
/// System.Object.
public object Get(GetPhyscialPaths request)
{
- var result = _libraryManager.RootFolder.Children.SelectMany(c => c.ResolveArgs.PhysicalLocations).ToList();
+ var result = _libraryManager.RootFolder.Children
+ .SelectMany(c =>
+ {
+ var locationType = c.LocationType;
+
+ if (locationType != LocationType.Remote && locationType != LocationType.Virtual)
+ {
+ try
+ {
+ return c.ResolveArgs.PhysicalLocations;
+ }
+ catch (Exception ex)
+ {
+ Logger.ErrorException("Error getting ResolveArgs for {0}", ex, c.Path);
+ }
+
+ }
+
+ return new List();
+ })
+ .ToList();
return ToOptimizedResult(result);
}