Merge branch 'dev' into cleanup

1 files changed, 4 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index dbe30f9a5..d9952cea8 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -997,7 +997,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (items == null)
             {
-                throw new ArgumentNullException("items");
+                throw new ArgumentNullException(nameof(items));
             }
 
             if (CollapseBoxSetItems(query, queryParent, user, configurationManager))
@@ -1252,7 +1252,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException();
+                throw new ArgumentNullException(nameof(user));
             }
 
             //the true root should return our users root folder children
@@ -1332,7 +1332,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException("user");
+                throw new ArgumentNullException(nameof(user));
             }
 
             var result = new Dictionary<Guid, BaseItem>();
@@ -1705,7 +1705,7 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                // These are just far too slow. 
+                // These are just far too slow.
                 if (this is ICollectionFolder)
                 {
                     return false;