Merge branch 'dev' into skia-native-arm

1 files changed, 7 insertions, 4 deletions

diff --git a/Emby.Server.Implementations/Sorting/NameComparer.cs b/Emby.Server.Implementations/Sorting/NameComparer.cs
index 8ab5e5172..cfd810a6b 100644
--- a/Emby.Server.Implementations/Sorting/NameComparer.cs
+++ b/Emby.Server.Implementations/Sorting/NameComparer.cs
@@ -18,6 +18,12 @@ namespace Emby.Server.Implementations.Sorting
         /// <returns>System.Int32.</returns>
         public int Compare(BaseItem x, BaseItem y)
         {
+            if (x == null)
+                throw new ArgumentNullException(nameof(x));
+
+            if (y == null)
+                throw new ArgumentNullException(nameof(y));
+
             return string.Compare(x.Name, y.Name, StringComparison.CurrentCultureIgnoreCase);
         }
 
@@ -25,9 +31,6 @@ namespace Emby.Server.Implementations.Sorting
         /// Gets the name.
         /// </summary>
         /// <value>The name.</value>
-        public string Name
-        {
-            get { return ItemSortBy.Name; }
-        }
+        public string Name => ItemSortBy.Name;
     }
 }