Fix exception logging

59 files changed, 390 insertions, 407 deletions

diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index a84d6d45f..fcdcb0c2c 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -34,7 +34,7 @@ namespace Emby.Server.Implementations.Activity
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error loading database file. Will reset and retry.", ex);
+                Logger.LogError(ex, "Error loading database file. Will reset and retry.");
 
                 FileSystem.DeleteFile(DbFilePath);
 
@@ -73,7 +73,7 @@ namespace Emby.Server.Implementations.Activity
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error migrating activity log database", ex);
+                Logger.LogError(ex, "Error migrating activity log database");
             }
         }
 
@@ -87,36 +87,34 @@ namespace Emby.Server.Implementations.Activity
             }
 
             using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                connection.RunInTransaction(db =>
                 {
-                    connection.RunInTransaction(db =>
+                    using (var statement = db.PrepareStatement("insert into ActivityLog (Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity) values (@Name, @Overview, @ShortOverview, @Type, @ItemId, @UserId, @DateCreated, @LogSeverity)"))
                     {
-                        using (var statement = db.PrepareStatement("insert into ActivityLog (Name, Overview, ShortOverview, Type, ItemId, UserId, DateCreated, LogSeverity) values (@Name, @Overview, @ShortOverview, @Type, @ItemId, @UserId, @DateCreated, @LogSeverity)"))
+                        statement.TryBind("@Name", entry.Name);
+
+                        statement.TryBind("@Overview", entry.Overview);
+                        statement.TryBind("@ShortOverview", entry.ShortOverview);
+                        statement.TryBind("@Type", entry.Type);
+                        statement.TryBind("@ItemId", entry.ItemId);
+
+                        if (entry.UserId.Equals(Guid.Empty))
                         {
-                            statement.TryBind("@Name", entry.Name);
-
-                            statement.TryBind("@Overview", entry.Overview);
-                            statement.TryBind("@ShortOverview", entry.ShortOverview);
-                            statement.TryBind("@Type", entry.Type);
-                            statement.TryBind("@ItemId", entry.ItemId);
-
-                            if (entry.UserId.Equals(Guid.Empty))
-                            {
-                                statement.TryBindNull("@UserId");
-                            }
-                            else
-                            {
-                                statement.TryBind("@UserId", entry.UserId.ToString("N"));
-                            }
-
-                            statement.TryBind("@DateCreated", entry.Date.ToDateTimeParamValue());
-                            statement.TryBind("@LogSeverity", entry.Severity.ToString());
-
-                            statement.MoveNext();
+                            statement.TryBindNull("@UserId");
                         }
-                    }, TransactionMode);
-                }
+                        else
+                        {
+                            statement.TryBind("@UserId", entry.UserId.ToString("N"));
+                        }
+
+                        statement.TryBind("@DateCreated", entry.Date.ToDateTimeParamValue());
+                        statement.TryBind("@LogSeverity", entry.Severity.ToString());
+
+                        statement.MoveNext();
+                    }
+                }, TransactionMode);
             }
         }
 
@@ -128,132 +126,128 @@ namespace Emby.Server.Implementations.Activity
             }
 
             using (WriteLock.Write())
+            using (var connection = CreateConnection())
             {
-                using (var connection = CreateConnection())
+                connection.RunInTransaction(db =>
                 {
-                    connection.RunInTransaction(db =>
+                    using (var statement = db.PrepareStatement("Update ActivityLog set Name=@Name,Overview=@Overview,ShortOverview=@ShortOverview,Type=@Type,ItemId=@ItemId,UserId=@UserId,DateCreated=@DateCreated,LogSeverity=@LogSeverity where Id=@Id"))
                     {
-                        using (var statement = db.PrepareStatement("Update ActivityLog set Name=@Name,Overview=@Overview,ShortOverview=@ShortOverview,Type=@Type,ItemId=@ItemId,UserId=@UserId,DateCreated=@DateCreated,LogSeverity=@LogSeverity where Id=@Id"))
+                        statement.TryBind("@Id", entry.Id);
+
+                        statement.TryBind("@Name", entry.Name);
+                        statement.TryBind("@Overview", entry.Overview);
+                        statement.TryBind("@ShortOverview", entry.ShortOverview);
+                        statement.TryBind("@Type", entry.Type);
+                        statement.TryBind("@ItemId", entry.ItemId);
+
+                        if (entry.UserId.Equals(Guid.Empty))
                         {
-                            statement.TryBind("@Id", entry.Id);
-
-                            statement.TryBind("@Name", entry.Name);
-                            statement.TryBind("@Overview", entry.Overview);
-                            statement.TryBind("@ShortOverview", entry.ShortOverview);
-                            statement.TryBind("@Type", entry.Type);
-                            statement.TryBind("@ItemId", entry.ItemId);
-
-                            if (entry.UserId.Equals(Guid.Empty))
-                            {
-                                statement.TryBindNull("@UserId");
-                            }
-                            else
-                            {
-                                statement.TryBind("@UserId", entry.UserId.ToString("N"));
-                            }
-
-                            statement.TryBind("@DateCreated", entry.Date.ToDateTimeParamValue());
-                            statement.TryBind("@LogSeverity", entry.Severity.ToString());
-
-                            statement.MoveNext();
+                            statement.TryBindNull("@UserId");
                         }
-                    }, TransactionMode);
-                }
+                        else
+                        {
+                            statement.TryBind("@UserId", entry.UserId.ToString("N"));
+                        }
+
+                        statement.TryBind("@DateCreated", entry.Date.ToDateTimeParamValue());
+                        statement.TryBind("@LogSeverity", entry.Severity.ToString());
+
+                        statement.MoveNext();
+                    }
+                }, TransactionMode);
             }
         }
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? startIndex, int? limit)
         {
             using (WriteLock.Read())
+            using (var connection = CreateConnection(true))
             {
-                using (var connection = CreateConnection(true))
-                {
-                    var commandText = BaseActivitySelectText;
-                    var whereClauses = new List<string>();
+                var commandText = BaseActivitySelectText;
+                var whereClauses = new List<string>();
 
-                    if (minDate.HasValue)
+                if (minDate.HasValue)
+                {
+                    whereClauses.Add("DateCreated>=@DateCreated");
+                }
+                if (hasUserId.HasValue)
+                {
+                    if (hasUserId.Value)
                     {
-                        whereClauses.Add("DateCreated>=@DateCreated");
+                        whereClauses.Add("UserId not null");
                     }
-                    if (hasUserId.HasValue)
+                    else
                     {
-                        if (hasUserId.Value)
-                        {
-                            whereClauses.Add("UserId not null");
-                        }
-                        else
-                        {
-                            whereClauses.Add("UserId is null");
-                        }
+                        whereClauses.Add("UserId is null");
                     }
+                }
 
-                    var whereTextWithoutPaging = whereClauses.Count == 0 ?
-                      string.Empty :
-                      " where " + string.Join(" AND ", whereClauses.ToArray());
-
-                    if (startIndex.HasValue && startIndex.Value > 0)
-                    {
-                        var pagingWhereText = whereClauses.Count == 0 ?
-                            string.Empty :
-                            " where " + string.Join(" AND ", whereClauses.ToArray());
+                var whereTextWithoutPaging = whereClauses.Count == 0 ?
+                  string.Empty :
+                  " where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
 
-                        whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLog {0} ORDER BY DateCreated DESC LIMIT {1})",
-                            pagingWhereText,
-                            startIndex.Value.ToString(_usCulture)));
-                    }
-
-                    var whereText = whereClauses.Count == 0 ?
+                if (startIndex.HasValue && startIndex.Value > 0)
+                {
+                    var pagingWhereText = whereClauses.Count == 0 ?
                         string.Empty :
                         " where " + string.Join(" AND ", whereClauses.ToArray());
 
-                    commandText += whereText;
+                    whereClauses.Add(string.Format("Id NOT IN (SELECT Id FROM ActivityLog {0} ORDER BY DateCreated DESC LIMIT {1})",
+                        pagingWhereText,
+                        startIndex.Value.ToString(_usCulture)));
+                }
 
-                    commandText += " ORDER BY DateCreated DESC";
+                var whereText = whereClauses.Count == 0 ?
+                    string.Empty :
+                    " where " + string.Join(" AND ", whereClauses.ToArray(whereClauses.Count));
 
-                    if (limit.HasValue)
-                    {
-                        commandText += " LIMIT " + limit.Value.ToString(_usCulture);
-                    }
+                commandText += whereText;
 
-                    var statementTexts = new List<string>();
-                    statementTexts.Add(commandText);
-                    statementTexts.Add("select count (Id) from ActivityLog" + whereTextWithoutPaging);
+                commandText += " ORDER BY DateCreated DESC";
 
-                    return connection.RunInTransaction(db =>
-                    {
-                        var list = new List<ActivityLogEntry>();
-                        var result = new QueryResult<ActivityLogEntry>();
+                if (limit.HasValue)
+                {
+                    commandText += " LIMIT " + limit.Value.ToString(_usCulture);
+                }
 
-                        var statements = PrepareAllSafe(db, statementTexts).ToList();
+                var statementTexts = new List<string>();
+                statementTexts.Add(commandText);
+                statementTexts.Add("select count (Id) from ActivityLog" + whereTextWithoutPaging);
+
+                return connection.RunInTransaction(db =>
+                {
+                    var list = new List<ActivityLogEntry>();
+                    var result = new QueryResult<ActivityLogEntry>();
 
-                        using (var statement = statements[0])
+                    var statements = PrepareAllSafe(db, statementTexts).ToList();
+
+                    using (var statement = statements[0])
+                    {
+                        if (minDate.HasValue)
                         {
-                            if (minDate.HasValue)
-                            {
-                                statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
-                            }
-
-                            foreach (var row in statement.ExecuteQuery())
-                            {
-                                list.Add(GetEntry(row));
-                            }
+                            statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
                         }
 
-                        using (var statement = statements[1])
+                        foreach (var row in statement.ExecuteQuery())
                         {
-                            if (minDate.HasValue)
-                            {
-                                statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
-                            }
+                            list.Add(GetEntry(row));
+                        }
+                    }
 
-                            result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                    using (var statement = statements[1])
+                    {
+                        if (minDate.HasValue)
+                        {
+                            statement.TryBind("@DateCreated", minDate.Value.ToDateTimeParamValue());
                         }
 
-                        result.Items = list.ToArray();
-                        return result;
+                        result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
+                    }
 
-                    }, ReadTransactionMode);
-                }
+                    result.Items = list.ToArray(list.Count);
+                    return result;
+
+                }, ReadTransactionMode);
             }
         }
 
diff --git a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
index fdf2a3b73..fddf19893 100644
--- a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
+++ b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
@@ -259,7 +259,7 @@ namespace Emby.Server.Implementations.AppBase
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error loading configuration file: {0}", ex, path);
+                Logger.LogError(ex, "Error loading configuration file: {path}", path);
 
                 return Activator.CreateInstance(configurationType);
             }
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index aa9b6e82a..888635c9d 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -545,7 +545,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error creating {0}", ex, type.FullName);
+                Logger.LogError(ex, "Error creating {type}", type.FullName);
                 // Don't blow up in release mode
                 return null;
             }
@@ -625,7 +625,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error loading assembly {0}", ex, file);
+                Logger.LogError(ex, "Error loading assembly {file}", file);
                 return null;
             }
         }
@@ -648,7 +648,7 @@ namespace Emby.Server.Implementations
         /// <typeparam name="T"></typeparam>
         /// <param name="manageLiftime">if set to <c>true</c> [manage liftime].</param>
         /// <returns>IEnumerable{``0}.</returns>
-        public IEnumerable<T> GetExports<T>(bool manageLiftime = true)
+        public IEnumerable<T> GetExports<T>(bool manageLifetime = true)
         {
             var parts = GetExportTypes<T>()
                 .Select(CreateInstanceSafe)
@@ -656,7 +656,7 @@ namespace Emby.Server.Implementations
                 .Cast<T>()
                 .ToList();
 
-            if (manageLiftime)
+            if (manageLifetime)
             {
                 lock (DisposableParts)
                 {
@@ -667,7 +667,7 @@ namespace Emby.Server.Implementations
             return parts;
         }
 
-        public List<Tuple<T, string>> GetExportsWithInfo<T>(bool manageLiftime = true)
+        public List<Tuple<T, string>> GetExportsWithInfo<T>(bool manageLifetime = true)
         {
             var parts = GetExportTypes<T>()
                 .Select(i =>
@@ -683,7 +683,7 @@ namespace Emby.Server.Implementations
                 .Where(i => i != null)
                 .ToList();
 
-            if (manageLiftime)
+            if (manageLifetime)
             {
                 lock (DisposableParts)
                 {
@@ -693,6 +693,8 @@ namespace Emby.Server.Implementations
 
             return parts;
         }
+
+        // TODO: @bond
         /*
         private void SetBaseExceptionMessage()
         {
@@ -760,7 +762,7 @@ namespace Emby.Server.Implementations
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error in {0}", ex, name);
+                    Logger.LogError(ex, "Error in {name}", name);
                 }
                 Logger.LogInformation("Entry point completed: {0}. Duration: {1} seconds", name, (DateTime.UtcNow - now).TotalSeconds.ToString(CultureInfo.InvariantCulture), "ImageInfos");
             }
@@ -777,7 +779,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error configuring autorun", ex);
+                Logger.LogError(ex, "Error configuring autorun");
             }
         }
 
@@ -1119,7 +1121,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error setting http limit", ex);
+                Logger.LogError(ex, "Error setting http limit");
             }
         }
 
@@ -1186,7 +1188,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error loading cert from {0}", ex, certificateLocation);
+                Logger.LogError(ex, "Error loading cert from {certificateLocation}", certificateLocation);
                 return null;
             }
         }
@@ -1415,7 +1417,7 @@ namespace Emby.Server.Implementations
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error getting plugin Id from {0}.", ex, plugin.GetType().FullName);
+                        Logger.LogError(ex, "Error getting plugin Id from {pluginName}.", plugin.GetType().FullName);
                     }
                 }
 
@@ -1427,7 +1429,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error loading plugin {0}", ex, plugin.GetType().FullName);
+                Logger.LogError(ex, "Error loading plugin {pluginName}", plugin.GetType().FullName);
                 return null;
             }
 
@@ -1450,11 +1452,11 @@ namespace Emby.Server.Implementations
 
                 if (path == null)
                 {
-                    Logger.LogInformation("Loading {0}", assembly.FullName);
+                    Logger.LogInformation("Loading {assemblyName}", assembly.FullName);
                 }
                 else
                 {
-                    Logger.LogInformation("Loading {0} from {1}", assembly.FullName, path);
+                    Logger.LogInformation("Loading {assemblyName} from {path}", assembly.FullName, path);
                 }
             }
 
@@ -1507,7 +1509,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error loading types from assembly", ex);
+                Logger.LogError(ex, "Error loading types from assembly");
 
                 return new List<Tuple<Type, string>>();
             }
@@ -1554,7 +1556,7 @@ namespace Emby.Server.Implementations
                   ? "The http server is unable to start due to a Socket error. This can occasionally happen when the operating system takes longer than usual to release the IP bindings from the previous session. This can take up to five minutes. Please try waiting or rebooting the system."
                   : "Error starting Http Server";
 
-                Logger.LogError(msg, ex);
+                Logger.LogError(ex, msg);
 
                 if (HttpPort == ServerConfiguration.DefaultHttpPort)
                 {
@@ -1570,7 +1572,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error starting http server", ex);
+                Logger.LogError(ex, "Error starting http server");
 
                 throw;
             }
@@ -1605,7 +1607,7 @@ namespace Emby.Server.Implementations
             //        }
             //        catch (Exception ex)
             //        {
-            //            Logger.LogError("Error creating ssl cert", ex);
+            //            Logger.LogError(ex, "Error creating ssl cert");
             //            return null;
             //        }
             //    }
@@ -1710,7 +1712,7 @@ namespace Emby.Server.Implementations
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error sending server restart notification", ex);
+                    Logger.LogError(ex, "Error sending server restart notification");
                 }
 
                 Logger.LogInformation("Calling RestartInternal");
@@ -1845,7 +1847,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error getting version number from {0}", ex, path);
+                Logger.LogError(ex, "Error getting version number from {path}", path);
 
                 return new Version(1, 0);
             }
@@ -1930,13 +1932,13 @@ namespace Emby.Server.Implementations
 
                         if (version < minRequiredVersion)
                         {
-                            Logger.LogInformation("Not loading {0} {1} because the minimum supported version is {2}. Please update to the newer version", filename, version, minRequiredVersion);
+                            Logger.LogInformation("Not loading {filename} {version} because the minimum supported version is {minRequiredVersion}. Please update to the newer version", filename, version, minRequiredVersion);
                             return false;
                         }
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error getting version number from {0}", ex, path);
+                        Logger.LogError(ex, "Error getting version number from {path}", path);
 
                         return false;
                     }
@@ -2043,7 +2045,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error getting local Ip address information", ex);
+                Logger.LogError(ex, "Error getting local Ip address information");
             }
 
             return null;
@@ -2251,7 +2253,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error sending server shutdown notification", ex);
+                Logger.LogError(ex, "Error sending server shutdown notification");
             }
 
             ShutdownInternal();
@@ -2276,7 +2278,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error authorizing server", ex);
+                Logger.LogError(ex, "Error authorizing server");
             }
         }
 
@@ -2443,9 +2445,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                Console.WriteLine("Error launching url: {0}", url);
-                Logger.LogError("Error launching url: {0}", ex, url);
-
+                Logger.LogError(ex, "Error launching url: {url}", url);
                 throw;
             }
         }
@@ -2516,7 +2516,7 @@ namespace Emby.Server.Implementations
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error disposing {0}", ex, part.GetType().Name);
+                        Logger.LogError(ex, "Error disposing {0}", part.GetType().Name);
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index 88dfbd7c1..00da46f30 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -300,7 +300,7 @@ namespace Emby.Server.Implementations.Channels
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting channel information for {0}", ex, channelInfo.Name);
+                    _logger.LogError(ex, "Error getting channel information for {0}", channelInfo.Name);
                 }
 
                 numComplete++;
@@ -848,7 +848,7 @@ namespace Emby.Server.Implementations.Channels
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error writing to channel cache file: {0}", ex, path);
+                _logger.LogError(ex, "Error writing to channel cache file: {path}", path);
             }
         }
 
@@ -911,7 +911,7 @@ namespace Emby.Server.Implementations.Channels
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error retrieving channel item from database", ex);
+                _logger.LogError(ex, "Error retrieving channel item from database");
             }
 
             if (item == null)
diff --git a/Emby.Server.Implementations/Collections/CollectionManager.cs b/Emby.Server.Implementations/Collections/CollectionManager.cs
index af7c70d7d..d1afb0712 100644
--- a/Emby.Server.Implementations/Collections/CollectionManager.cs
+++ b/Emby.Server.Implementations/Collections/CollectionManager.cs
@@ -365,7 +365,7 @@ namespace Emby.Server.Implementations.Collections
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error creating camera uploads library", ex);
+                        _logger.LogError(ex, "Error creating camera uploads library");
                     }
 
                     _config.Configuration.CollectionsUpgraded = true;
diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
index 8e59596dd..59776c373 100644
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
@@ -323,7 +323,7 @@ namespace Emby.Server.Implementations.Data
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error disposing database", ex);
+                Logger.LogError(ex, "Error disposing database");
             }
         }
 
diff --git a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
index 307342135..00e1956cf 100644
--- a/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteDisplayPreferencesRepository.cs
@@ -53,7 +53,7 @@ namespace Emby.Server.Implementations.Data
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error loading database file. Will reset and retry.", ex);
+                Logger.LogError(ex, "Error loading database file. Will reset and retry.");
 
                 FileSystem.DeleteFile(DbFilePath);
 
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 7239eec93..0f9770e8f 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1364,7 +1364,7 @@ namespace Emby.Server.Implementations.Data
                     }
                     catch (SerializationException ex)
                     {
-                        Logger.LogError("Error deserializing item", ex);
+                        Logger.LogError(ex, "Error deserializing item");
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index 9ac255ec4..d490a481e 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -74,7 +74,7 @@ namespace Emby.Server.Implementations.Data
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error migrating users database", ex);
+                Logger.LogError(ex, "Error migrating users database");
             }
         }
 
diff --git a/Emby.Server.Implementations/Devices/DeviceId.cs b/Emby.Server.Implementations/Devices/DeviceId.cs
index fe953bfb9..90cef5d06 100644
--- a/Emby.Server.Implementations/Devices/DeviceId.cs
+++ b/Emby.Server.Implementations/Devices/DeviceId.cs
@@ -45,7 +45,7 @@ namespace Emby.Server.Implementations.Devices
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error reading file", ex);
+                _logger.LogError(ex, "Error reading file");
             }
 
             return null;
@@ -66,7 +66,7 @@ namespace Emby.Server.Implementations.Devices
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error writing to file", ex);
+                _logger.LogError(ex, "Error writing to file");
             }
         }
 
diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index c5c86f5b9..250316211 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -434,7 +434,7 @@ namespace Emby.Server.Implementations.Devices
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error creating camera uploads library", ex);
+                        _logger.LogError(ex, "Error creating camera uploads library");
                     }
 
                     _config.Configuration.CameraUploadUpgraded = true;
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 424309995..e8d06ec00 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -225,7 +225,7 @@ namespace Emby.Server.Implementations.Dto
                 catch (Exception ex)
                 {
                     // Have to use a catch-all unfortunately because some .net image methods throw plain Exceptions
-                    _logger.LogError("Error generating PrimaryImageAspectRatio for {0}", ex, item.Name);
+                    _logger.LogError(ex, "Error generating PrimaryImageAspectRatio for {itemName}", item.Name);
                 }
             }
 
@@ -547,7 +547,7 @@ namespace Emby.Server.Implementations.Dto
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting {0} image info", ex, type);
+                _logger.LogError(ex, "Error getting {type} image info", type);
                 return null;
             }
         }
@@ -560,7 +560,7 @@ namespace Emby.Server.Implementations.Dto
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting {0} image info for {1}", ex, image.Type, image.Path);
+                _logger.LogError(ex, "Error getting {imageType} image info for {path}", image.Type, image.Path);
                 return null;
             }
         }
@@ -619,7 +619,7 @@ namespace Emby.Server.Implementations.Dto
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error getting person {0}", ex, c);
+                        _logger.LogError(ex, "Error getting person {0}", c);
                         return null;
                     }
 
@@ -1451,7 +1451,7 @@ namespace Emby.Server.Implementations.Dto
                 }
                 catch (Exception ex)
                 {
-                    //_logger.LogError("Failed to determine primary image aspect ratio for {0}", ex, imageInfo.Path);
+                    _logger.LogError(ex, "Failed to determine primary image aspect ratio for {0}", imageInfo.Path);
                     return null;
                 }
             }
@@ -1464,7 +1464,7 @@ namespace Emby.Server.Implementations.Dto
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error in image enhancer: {0}", ex, enhancer.GetType().Name);
+                    _logger.LogError(ex, "Error in image enhancer: {0}", enhancer.GetType().Name);
                 }
             }
 
diff --git a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
index cd5fca40d..a0947c87d 100644
--- a/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/AutomaticRestartEntryPoint.cs
@@ -73,7 +73,7 @@ namespace Emby.Server.Implementations.EntryPoints
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error restarting server", ex);
+                        _logger.LogError(ex, "Error restarting server");
                     }
                 }
             }
@@ -98,7 +98,7 @@ namespace Emby.Server.Implementations.EntryPoints
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting timers", ex);
+                    _logger.LogError(ex, "Error getting timers");
                 }
             }
 
diff --git a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index 46fbc94fd..a95e21e1c 100644
--- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -216,7 +216,7 @@ namespace Emby.Server.Implementations.EntryPoints
             catch
             {
                 // Commenting out because users are reporting problems out of our control
-                //_logger.LogError("Error creating port forwarding rules", ex);
+                //_logger.LogError(ex, "Error creating port forwarding rules");
             }
         }
 
@@ -253,6 +253,7 @@ namespace Emby.Server.Implementations.EntryPoints
             }
             catch (Exception ex)
             {
+                _logger.LogError(ex, "Error creating http port map");
                 return;
             }
 
@@ -262,6 +263,7 @@ namespace Emby.Server.Implementations.EntryPoints
             }
             catch (Exception ex)
             {
+                _logger.LogError(ex, "Error creating https port map");
             }
         }
 
@@ -309,7 +311,7 @@ namespace Emby.Server.Implementations.EntryPoints
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error stopping NAT Discovery", ex);
+                        _logger.LogError(ex, "Error stopping NAT Discovery");
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs b/Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs
index a9121ba32..a6dadcef0 100644
--- a/Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs
+++ b/Emby.Server.Implementations/EntryPoints/KeepServerAwake.cs
@@ -49,7 +49,7 @@ namespace Emby.Server.Implementations.EntryPoints
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error resetting system standby timer", ex);
+                _logger.LogError(ex, "Error resetting system standby timer");
             }
         }
 
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index ff283667b..bb8ef52f1 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -331,7 +331,7 @@ namespace Emby.Server.Implementations.EntryPoints
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error in GetLibraryUpdateInfo", ex);
+                    _logger.LogError(ex, "Error in GetLibraryUpdateInfo");
                     return;
                 }
 
@@ -346,7 +346,7 @@ namespace Emby.Server.Implementations.EntryPoints
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error sending LibraryChanged message", ex);
+                    _logger.LogError(ex, "Error sending LibraryChanged message");
                 }
             }
         }
diff --git a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
index 24cd659e1..0b377dc68 100644
--- a/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs
@@ -66,7 +66,7 @@ namespace Emby.Server.Implementations.EntryPoints
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error sending message", ex);
+                _logger.LogError(ex, "Error sending message");
             }
         }
 
diff --git a/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs b/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
index f6a74c4ec..72dcabab3 100644
--- a/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
@@ -157,13 +157,9 @@ namespace Emby.Server.Implementations.EntryPoints
             {
                 await _sessionManager.SendMessageToAdminSessions(name, data, CancellationToken.None);
             }
-            catch (ObjectDisposedException)
-            {
-
-            }
             catch (Exception)
             {
-                //Logger.LogError("Error sending message", ex);
+
             }
         }
 
@@ -173,13 +169,9 @@ namespace Emby.Server.Implementations.EntryPoints
             {
                 await _sessionManager.SendMessageToUserSessions(new List<Guid> { user.Id }, name, data, CancellationToken.None);
             }
-            catch (ObjectDisposedException)
-            {
-
-            }
             catch (Exception)
             {
-                //Logger.LogError("Error sending message", ex);
+
             }
         }
 
diff --git a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
index 1bb11ce40..f8e2d32dd 100644
--- a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.EntryPoints
             }
             catch (Exception ex)
             {
-                _logger.LogError("Failed to start UDP Server", ex);
+                _logger.LogError(ex, "Failed to start UDP Server");
             }
         }
 
diff --git a/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs
index ca79262b0..f7542a5e9 100644
--- a/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/UsageEntryPoint.cs
@@ -91,7 +91,7 @@ namespace Emby.Server.Implementations.EntryPoints
             }
             catch (Exception ex)
             {
-                //_logger.LogError("Error sending anonymous usage statistics.", ex);
+                _logger.LogError(ex, "Error sending anonymous usage statistics.");
             }
         }
 
@@ -119,7 +119,7 @@ namespace Emby.Server.Implementations.EntryPoints
             }
             catch (Exception ex)
             {
-                //_logger.LogError("Error sending anonymous usage statistics.", ex);
+                _logger.LogError(ex, "Error sending anonymous usage statistics.");
             }
         }
 
diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
index b3f8ef884..23dd55b18 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
@@ -685,7 +685,7 @@ namespace Emby.Server.Implementations.HttpClientManager
             {
                 if (options.LogErrors)
                 {
-                    _logger.LogError("Error " + webException.Status + " getting response from " + options.Url, webException);
+                    _logger.LogError(webException, "Error {status} getting response from {url}", webException.Status, options.Url);
                 }
 
                 var exception = new HttpException(webException.Message, webException);
@@ -723,7 +723,7 @@ namespace Emby.Server.Implementations.HttpClientManager
 
             if (options.LogErrors)
             {
-                _logger.LogError("Error getting response from " + options.Url, ex);
+                _logger.LogError(ex, "Error getting response from {url}", options.Url);
             }
 
             return ex;
diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
index 1d87d0e44..704b7f8a6 100644
--- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -252,7 +252,7 @@ namespace Emby.Server.Implementations.HttpServer
 
                 if (logExceptionStackTrace)
                 {
-                    _logger.LogError("Error processing request", ex);
+                    _logger.LogError(ex, "Error processing request");
                 }
                 else if (logExceptionMessage)
                 {
@@ -272,9 +272,9 @@ namespace Emby.Server.Implementations.HttpServer
                 httpRes.ContentType = "text/html";
                 await Write(httpRes, NormalizeExceptionMessage(ex.Message)).ConfigureAwait(false);
             }
-            catch
+            catch (Exception errorEx)
             {
-                //_logger.LogError("Error this.ProcessRequest(context)(Exception while writing error to the response)", errorEx);
+                _logger.LogError(errorEx, "Error this.ProcessRequest(context)(Exception while writing error to the response)");
             }
         }
 
@@ -713,7 +713,7 @@ namespace Emby.Server.Implementations.HttpServer
             var pathParts = pathInfo.TrimStart('/').Split('/');
             if (pathParts.Length == 0)
             {
-                _logger.LogError("Path parts empty for PathInfo: {0}, Url: {1}", pathInfo, httpReq.RawUrl);
+                _logger.LogError("Path parts empty for PathInfo: {pathInfo}, Url: {RawUrl}", pathInfo, httpReq.RawUrl);
                 return null;
             }
 
@@ -729,7 +729,7 @@ namespace Emby.Server.Implementations.HttpServer
                 };
             }
 
-            _logger.LogError("Could not find handler for {0}", pathInfo);
+            _logger.LogError("Could not find handler for {pathInfo}", pathInfo);
             return null;
         }
 
@@ -919,7 +919,7 @@ namespace Emby.Server.Implementations.HttpServer
                 return Task.CompletedTask;
             }
 
-            //_logger.LogDebug("Websocket message received: {0}", result.MessageType);
+            _logger.LogDebug("Websocket message received: {0}", result.MessageType);
 
             var tasks = _webSocketListeners.Select(i => Task.Run(async () =>
             {
@@ -929,7 +929,7 @@ namespace Emby.Server.Implementations.HttpServer
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("{0} failed processing WebSocket message {1}", ex, i.GetType().Name, result.MessageType ?? string.Empty);
+                    _logger.LogError(ex, "{0} failed processing WebSocket message {1}", i.GetType().Name, result.MessageType ?? string.Empty);
                 }
             }));
 
diff --git a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
index b1759069c..f38aa5ea0 100644
--- a/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/Emby.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -34,7 +34,7 @@ namespace Emby.Server.Implementations.HttpServer
 
             if (exception != null)
             {
-                _logger.LogError("Error processing request for {0}", exception, req.RawUrl);
+                _logger.LogError(exception, "Error processing request for {RawUrl}", req.RawUrl);
 
                 if (!string.IsNullOrEmpty(exception.Message))
                 {
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
index 037bdde77..8b5dfd444 100644
--- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
@@ -180,7 +180,7 @@ namespace Emby.Server.Implementations.HttpServer
             if (!message.StartsWith("{", StringComparison.OrdinalIgnoreCase))
             {
                 // This info is useful sometimes but also clogs up the log
-                //_lLogError("Received web socket message that is not a json structure: " + message);
+                _logger.LogDebug("Received web socket message that is not a json structure: {message}", message);
                 return;
             }
 
@@ -204,7 +204,7 @@ namespace Emby.Server.Implementations.HttpServer
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error processing web socket message", ex);
+                _logger.LogError(ex, "Error processing web socket message");
             }
         }
 
diff --git a/Emby.Server.Implementations/IO/FileRefresher.cs b/Emby.Server.Implementations/IO/FileRefresher.cs
index 6087f3cf2..df484d04c 100644
--- a/Emby.Server.Implementations/IO/FileRefresher.cs
+++ b/Emby.Server.Implementations/IO/FileRefresher.cs
@@ -141,7 +141,7 @@ namespace Emby.Server.Implementations.IO
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error processing directory changes", ex);
+                Logger.LogError(ex, "Error processing directory changes");
             }
         }
 
@@ -161,7 +161,7 @@ namespace Emby.Server.Implementations.IO
                     continue;
                 }
 
-                Logger.LogInformation(item.Name + " (" + item.Path + ") will be refreshed.");
+                Logger.LogInformation("{name} ({path}}) will be refreshed.", item.Name, item.Path);
 
                 try
                 {
@@ -172,11 +172,11 @@ namespace Emby.Server.Implementations.IO
                     // For now swallow and log. 
                     // Research item: If an IOException occurs, the item may be in a disconnected state (media unavailable)
                     // Should we remove it from it's parent?
-                    Logger.LogError("Error refreshing {0}", ex, item.Name);
+                    Logger.LogError(ex, "Error refreshing {name}", item.Name);
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error refreshing {0}", ex, item.Name);
+                    Logger.LogError(ex, "Error refreshing {name}", item.Name);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/IO/LibraryMonitor.cs b/Emby.Server.Implementations/IO/LibraryMonitor.cs
index 22d1783ed..ca5810fd6 100644
--- a/Emby.Server.Implementations/IO/LibraryMonitor.cs
+++ b/Emby.Server.Implementations/IO/LibraryMonitor.cs
@@ -114,7 +114,7 @@ namespace Emby.Server.Implementations.IO
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error in ReportFileSystemChanged for {0}", ex, path);
+                    Logger.LogError(ex, "Error in ReportFileSystemChanged for {path}", path);
                 }
             }
         }
@@ -354,7 +354,7 @@ namespace Emby.Server.Implementations.IO
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error watching path: {0}", ex, path);
+                    Logger.LogError(ex, "Error watching path: {path}", path);
                 }
             });
         }
@@ -382,7 +382,7 @@ namespace Emby.Server.Implementations.IO
             {
                 using (watcher)
                 {
-                    Logger.LogInformation("Stopping directory watching for path {0}", watcher.Path);
+                    Logger.LogInformation("Stopping directory watching for path {path}", watcher.Path);
 
                     watcher.Created -= watcher_Changed;
                     watcher.Deleted -= watcher_Changed;
@@ -439,7 +439,7 @@ namespace Emby.Server.Implementations.IO
             var ex = e.GetException();
             var dw = (FileSystemWatcher)sender;
 
-            Logger.LogError("Error in Directory watcher for: " + dw.Path, ex);
+            Logger.LogError(ex, "Error in Directory watcher for: {path}", dw.Path);
 
             DisposeWatcher(dw, true);
         }
@@ -461,7 +461,7 @@ namespace Emby.Server.Implementations.IO
             }
             catch (Exception ex)
             {
-                Logger.LogError("Exception in ReportFileSystemChanged. Path: {0}", ex, e.FullPath);
+                Logger.LogError(ex, "Exception in ReportFileSystemChanged. Path: {FullPath}", e.FullPath);
             }
         }
 
@@ -487,13 +487,13 @@ namespace Emby.Server.Implementations.IO
             {
                 if (_fileSystem.AreEqual(i, path))
                 {
-                    //logger.LogDebug("Ignoring change to {0}", path);
+                    Logger.LogDebug("Ignoring change to {path}", path);
                     return true;
                 }
 
                 if (_fileSystem.ContainsSubPath(i, path))
                 {
-                    //logger.LogDebug("Ignoring change to {0}", path);
+                    Logger.LogDebug("Ignoring change to {path}", path);
                     return true;
                 }
 
@@ -503,7 +503,7 @@ namespace Emby.Server.Implementations.IO
                 {
                     if (_fileSystem.AreEqual(parent, path))
                     {
-                        //logger.LogDebug("Ignoring change to {0}", path);
+                        Logger.LogDebug("Ignoring change to {path}", path);
                         return true;
                     }
                 }
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 42b9ae23b..8819449b5 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -175,7 +175,7 @@ namespace Emby.Server.Implementations.IO
                 path = System.IO.Path.GetFullPath(path);
                 return path;
             }
-            catch (ArgumentException ex)
+            catch (ArgumentException)
             {
                 return filePath;
             }
@@ -395,7 +395,7 @@ namespace Emby.Server.Implementations.IO
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error determining CreationTimeUtc for {0}", ex, info.FullName);
+                Logger.LogError(ex, "Error determining CreationTimeUtc for {FullName}", info.FullName);
                 return DateTime.MinValue;
             }
         }
@@ -434,7 +434,7 @@ namespace Emby.Server.Implementations.IO
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error determining LastAccessTimeUtc for {0}", ex, info.FullName);
+                Logger.LogError(ex, "Error determining LastAccessTimeUtc for {FullName}", info.FullName);
                 return DateTime.MinValue;
             }
         }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index e1a725c93..451f16bef 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -384,7 +384,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error deleting {0}", ex, metadataPath);
+                    _logger.LogError(ex, "Error deleting {metadataPath}", metadataPath);
                 }
             }
 
@@ -398,14 +398,13 @@ namespace Emby.Server.Implementations.Library
                 {
                     try
                     {
+                         _logger.LogDebug("Deleting path {path}", fileSystemInfo.FullName);
                         if (fileSystemInfo.IsDirectory)
                         {
-                            _logger.LogDebug("Deleting path {0}", fileSystemInfo.FullName);
                             _fileSystem.DeleteDirectory(fileSystemInfo.FullName, true);
                         }
                         else
                         {
-                            _logger.LogDebug("Deleting path {0}", fileSystemInfo.FullName);
                             _fileSystem.DeleteFile(fileSystemInfo.FullName);
                         }
                     }
@@ -489,7 +488,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error in {0} resolving {1}", ex, resolver.GetType().Name, args.Path);
+                _logger.LogError(ex, "Error in {resolver} resolving {path}", resolver.GetType().Name, args.Path);
                 return null;
             }
         }
@@ -587,7 +586,7 @@ namespace Emby.Server.Implementations.Library
                 {
                     if (parent != null && parent.IsPhysicalRoot)
                     {
-                        _logger.LogError("Error in GetFilteredFileSystemEntries isPhysicalRoot: {0} IsVf: {1}", ex, isPhysicalRoot, isVf);
+                        _logger.LogError(ex, "Error in GetFilteredFileSystemEntries isPhysicalRoot: {0} IsVf: {1}", isPhysicalRoot, isVf);
 
                         files = new FileSystemMetadata[] { };
                     }
@@ -713,7 +712,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error resolving path {0}", ex, f.FullName);
+                    _logger.LogError(ex, "Error resolving path {path}", f.FullName);
                     return null;
                 }
             }).Where(i => i != null);
@@ -1148,7 +1147,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error running postscan task", ex);
+                    _logger.LogError(ex, "Error running postscan task");
                 }
 
                 numComplete++;
@@ -1199,7 +1198,7 @@ namespace Emby.Server.Implementations.Library
                         }
                         catch (Exception ex)
                         {
-                            _logger.LogError("Error resolving shortcut file {0}", ex, i);
+                            _logger.LogError(ex, "Error resolving shortcut file {file}", i);
                             return null;
                         }
                     })
@@ -1650,7 +1649,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting intros", ex);
+                _logger.LogError(ex, "Error getting intros");
 
                 return new List<IntroInfo>();
             }
@@ -1670,7 +1669,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting intro files", ex);
+                    _logger.LogError(ex, "Error getting intro files");
 
                     return new List<string>();
                 }
@@ -1693,7 +1692,7 @@ namespace Emby.Server.Implementations.Library
 
                 if (video == null)
                 {
-                    _logger.LogError("Unable to locate item with Id {0}.", info.ItemId.Value);
+                    _logger.LogError("Unable to locate item with Id {ID}.", info.ItemId.Value);
                 }
             }
             else if (!string.IsNullOrEmpty(info.Path))
@@ -1705,7 +1704,7 @@ namespace Emby.Server.Implementations.Library
 
                     if (video == null)
                     {
-                        _logger.LogError("Intro resolver returned null for {0}.", info.Path);
+                        _logger.LogError("Intro resolver returned null for {path}.", info.Path);
                     }
                     else
                     {
@@ -1724,7 +1723,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error resolving path {0}.", ex, info.Path);
+                    _logger.LogError(ex, "Error resolving path {path}.", info.Path);
                 }
             }
             else
@@ -1873,7 +1872,7 @@ namespace Emby.Server.Implementations.Library
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error in ItemAdded event handler", ex);
+                        _logger.LogError(ex, "Error in ItemAdded event handler");
                     }
                 }
             }
@@ -1929,7 +1928,7 @@ namespace Emby.Server.Implementations.Library
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error in ItemUpdated event handler", ex);
+                        _logger.LogError(ex, "Error in ItemUpdated event handler");
                     }
                 }
             }
@@ -1965,7 +1964,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error in ItemRemoved event handler", ex);
+                    _logger.LogError(ex, "Error in ItemRemoved event handler");
                 }
             }
         }
@@ -2808,7 +2807,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting person", ex);
+                    _logger.LogError(ex, "Error getting person");
                     return null;
                 }
 
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 15673d25d..e5fd28997 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -256,7 +256,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting media sources", ex);
+                _logger.LogError(ex, "Error getting media sources");
                 return new List<MediaSourceInfo>();
             }
         }
@@ -477,7 +477,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error probing live tv stream", ex);
+                _logger.LogError(ex, "Error probing live tv stream");
                 AddMediaInfo(mediaSource, isAudio);
             }
 
diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 35b0ca304..ae3577b7d 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -392,7 +392,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error authenticating with provider {0}", ex, provider.Name);
+                _logger.LogError(ex, "Error authenticating with provider {provider}", provider.Name);
 
                 return false;
             }
@@ -575,7 +575,7 @@ namespace Emby.Server.Implementations.Library
                 catch (Exception ex)
                 {
                     // Have to use a catch-all unfortunately because some .net image methods throw plain Exceptions
-                    _logger.LogError("Error generating PrimaryImageAspectRatio for {0}", ex, user.Name);
+                    _logger.LogError(ex, "Error generating PrimaryImageAspectRatio for {user}", user.Name);
                 }
             }
 
@@ -599,7 +599,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting {0} image info for {1}", ex, image.Type, image.Path);
+                _logger.LogError(ex, "Error getting {imageType} image info for {imagePath}", image.Type, image.Path);
                 return null;
             }
         }
@@ -775,7 +775,7 @@ namespace Emby.Server.Implementations.Library
                 }
                 catch (IOException ex)
                 {
-                    _logger.LogError("Error deleting file {0}", ex, configPath);
+                    _logger.LogError(ex, "Error deleting file {path}", configPath);
                 }
 
                 DeleteUserPolicy(user);
@@ -1045,7 +1045,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error reading policy file: {0}", ex, path);
+                _logger.LogError(ex, "Error reading policy file: {path}", path);
 
                 return GetDefaultPolicy(user);
             }
@@ -1109,7 +1109,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error deleting policy file", ex);
+                _logger.LogError(ex, "Error deleting policy file");
             }
         }
 
@@ -1144,7 +1144,7 @@ namespace Emby.Server.Implementations.Library
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error reading policy file: {0}", ex, path);
+                _logger.LogError(ex, "Error reading policy file: {path}", path);
 
                 return new UserConfiguration();
             }
diff --git a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs
index 593a9a1ef..1686dc23c 100644
--- a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs
@@ -70,7 +70,7 @@ namespace Emby.Server.Implementations.Library.Validators
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error refreshing {0}", ex, name);
+                    _logger.LogError(ex, "Error refreshing {ArtistName}", name);
                 }
 
                 numComplete++;
diff --git a/Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs b/Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs
index ffa5608dd..070777475 100644
--- a/Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/GameGenresValidator.cs
@@ -57,7 +57,7 @@ namespace Emby.Server.Implementations.Library.Validators
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error refreshing {0}", ex, name);
+                    _logger.LogError(ex, "Error refreshing {GenreName}", name);
                 }
 
                 numComplete++;
diff --git a/Emby.Server.Implementations/Library/Validators/GenresValidator.cs b/Emby.Server.Implementations/Library/Validators/GenresValidator.cs
index e59b747de..775cde299 100644
--- a/Emby.Server.Implementations/Library/Validators/GenresValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/GenresValidator.cs
@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.Library.Validators
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error refreshing {0}", ex, name);
+                    _logger.LogError(ex, "Error refreshing {GenreName}", name);
                 }
 
                 numComplete++;
diff --git a/Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs b/Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs
index ec8568afc..b5ed1c0e6 100644
--- a/Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/MusicGenresValidator.cs
@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.Library.Validators
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error refreshing {0}", ex, name);
+                    _logger.LogError(ex, "Error refreshing {GenreName}", name);
                 }
 
                 numComplete++;
diff --git a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs b/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
index 80e396583..50c7cfbc6 100644
--- a/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/PeopleValidator.cs
@@ -78,7 +78,7 @@ namespace Emby.Server.Implementations.Library.Validators
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error validating IBN entry {0}", ex, person);
+                    _logger.LogError(ex, "Error validating IBN entry {person}", person);
                 }
 
                 // Update progress
diff --git a/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs b/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs
index fec989032..1a5ebac54 100644
--- a/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs
+++ b/Emby.Server.Implementations/Library/Validators/StudiosValidator.cs
@@ -57,7 +57,7 @@ namespace Emby.Server.Implementations.Library.Validators
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error refreshing {0}", ex, name);
+                    _logger.LogError(ex, "Error refreshing {StudioName}", name);
                 }
 
                 numComplete++;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index b9b8802a8..ef96510bd 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -170,7 +170,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error creating virtual folder", ex);
+                        _logger.LogError(ex, "Error creating virtual folder");
                     }
 
                     pathsAdded.AddRange(pathsToCreate);
@@ -196,7 +196,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error creating recording folders", ex);
+                _logger.LogError(ex, "Error creating recording folders");
             }
         }
 
@@ -224,7 +224,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error removing virtual folder", ex);
+                        _logger.LogError(ex, "Error removing virtual folder");
                     }
                 }
                 else
@@ -236,14 +236,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error removing media path", ex);
+                        _logger.LogError(ex, "Error removing media path");
                     }
                 }
             }
 
             if (requiresRefresh)
             {
-                _libraryManager.ValidateMediaLibrary(new SimpleProgress<Double>(), CancellationToken.None);
+                await _libraryManager.ValidateMediaLibrary(new SimpleProgress<Double>(), CancellationToken.None);
             }
         }
 
@@ -342,7 +342,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting channels", ex);
+                    _logger.LogError(ex, "Error getting channels");
                 }
             }
 
@@ -364,7 +364,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error adding metadata", ex);
+                        _logger.LogError(ex, "Error adding metadata");
                     }
                 }
             }
@@ -595,7 +595,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting channels", ex);
+                    _logger.LogError(ex, "Error getting channels");
                 }
             }
 
@@ -1217,7 +1217,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error recording stream", ex);
+                _logger.LogError(ex, "Error recording stream");
             }
         }
 
@@ -1414,16 +1414,16 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 await recorder.Record(directStreamProvider, mediaStreamInfo, recordPath, duration, onStarted, activeRecordingInfo.CancellationTokenSource.Token).ConfigureAwait(false);
 
                 recordingStatus = RecordingStatus.Completed;
-                _logger.LogInformation("Recording completed: {0}", recordPath);
+                _logger.LogInformation("Recording completed: {recordPath}", recordPath);
             }
             catch (OperationCanceledException)
             {
-                _logger.LogInformation("Recording stopped: {0}", recordPath);
+                _logger.LogInformation("Recording stopped: {recordPath}", recordPath);
                 recordingStatus = RecordingStatus.Completed;
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error recording to {0}", ex, recordPath);
+                _logger.LogError(ex, "Error recording to {recordPath}", recordPath);
                 recordingStatus = RecordingStatus.Error;
             }
 
@@ -1435,7 +1435,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error closing live stream", ex);
+                    _logger.LogError(ex, "Error closing live stream");
                 }
             }
 
@@ -1511,20 +1511,20 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error deleting 0-byte failed recording file {0}", ex, path);
+                    _logger.LogError(ex, "Error deleting 0-byte failed recording file {path}", path);
                 }
             }
         }
 
         private void TriggerRefresh(string path)
         {
-            _logger.LogInformation("Triggering refresh on {0}", path);
+            _logger.LogInformation("Triggering refresh on {path}", path);
 
             var item = GetAffectedBaseItem(_fileSystem.GetDirectoryName(path));
 
             if (item != null)
             {
-                _logger.LogInformation("Refreshing recording parent {0}", item.Path);
+                _logger.LogInformation("Refreshing recording parent {path}", item.Path);
 
                 _providerManager.QueueRefresh(item.Id, new MetadataRefreshOptions(new DirectoryService(_logger, _fileSystem))
                 {
@@ -1642,7 +1642,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error deleting item", ex);
+                        _logger.LogError(ex, "Error deleting item");
                     }
                 }
             }
@@ -1668,7 +1668,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error deleting recording", ex);
+                    _logger.LogError(ex, "Error deleting recording");
                 }
             }
         }
@@ -1780,7 +1780,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error running recording post processor", ex);
+                _logger.LogError(ex, "Error running recording post processor");
             }
         }
 
@@ -1794,7 +1794,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             var process = (IProcess)sender;
             try
             {
-                _logger.LogInformation("Recording post-processing script completed with exit code {0}", process.ExitCode);
+                _logger.LogInformation("Recording post-processing script completed with exit code {ExitCode}", process.ExitCode);
             }
             catch
             {
@@ -1875,7 +1875,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error saving recording image", ex);
+                    _logger.LogError(ex, "Error saving recording image");
                 }
             }
 
@@ -1890,7 +1890,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error saving recording image", ex);
+                        _logger.LogError(ex, "Error saving recording image");
                     }
                 }
 
@@ -1903,7 +1903,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error saving recording image", ex);
+                        _logger.LogError(ex, "Error saving recording image");
                     }
                 }
 
@@ -1916,7 +1916,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError("Error saving recording image", ex);
+                        _logger.LogError(ex, "Error saving recording image");
                     }
                 }
             }
@@ -1984,7 +1984,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error saving nfo", ex);
+                _logger.LogError(ex, "Error saving nfo");
             }
         }
 
@@ -2814,7 +2814,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error discovering tuner devices", ex);
+                _logger.LogError(ex, "Error discovering tuner devices");
 
                 return new List<TunerHostInfo>();
             }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index af5e96c05..4ea83b7ac 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -269,14 +269,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 try
                 {
-                    _logger.LogInformation("Stopping ffmpeg recording process for {0}", _targetPath);
+                    _logger.LogInformation("Stopping ffmpeg recording process for {path}", _targetPath);
 
                     //process.Kill();
                     _process.StandardInput.WriteLine("q");
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error stopping recording transcoding job for {0}", ex, _targetPath);
+                    _logger.LogError(ex, "Error stopping recording transcoding job for {path}", _targetPath);
                 }
 
                 if (_hasExited)
@@ -286,7 +286,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 try
                 {
-                    _logger.LogInformation("Calling recording process.WaitForExit for {0}", _targetPath);
+                    _logger.LogInformation("Calling recording process.WaitForExit for {path}", _targetPath);
 
                     if (_process.WaitForExit(10000))
                     {
@@ -295,7 +295,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error waiting for recording process to exit for {0}", ex, _targetPath);
+                    _logger.LogError(ex, "Error waiting for recording process to exit for {path}", _targetPath);
                 }
 
                 if (_hasExited)
@@ -305,13 +305,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
                 try
                 {
-                    _logger.LogInformation("Killing ffmpeg recording process for {0}", _targetPath);
+                    _logger.LogInformation("Killing ffmpeg recording process for {path}", _targetPath);
 
                     _process.Kill();
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error killing recording transcoding job for {0}", ex, _targetPath);
+                    _logger.LogError(ex, "Error killing recording transcoding job for {path}", _targetPath);
                 }
             }
         }
@@ -329,7 +329,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 var exitCode = process.ExitCode;
 
-                _logger.LogInformation("FFMpeg recording exited with code {0} for {1}", exitCode, _targetPath);
+                _logger.LogInformation("FFMpeg recording exited with code {ExitCode} for {path}", exitCode, _targetPath);
 
                 if (exitCode == 0)
                 {
@@ -337,13 +337,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 else
                 {
-                    _taskCompletionSource.TrySetException(new Exception(string.Format("Recording for {0} failed. Exit code {1}", _targetPath, exitCode)));
+                    _taskCompletionSource.TrySetException(new Exception(string.Format("Recording for {path} failed. Exit code {ExitCode}", _targetPath, exitCode)));
                 }
             }
             catch
             {
-                _logger.LogError("FFMpeg recording exited with an error for {0}.", _targetPath);
-                _taskCompletionSource.TrySetException(new Exception(string.Format("Recording for {0} failed", _targetPath)));
+                _logger.LogError("FFMpeg recording exited with an error for {path}.", _targetPath);
+                _taskCompletionSource.TrySetException(new Exception(string.Format("Recording for {path} failed", _targetPath)));
             }
         }
 
@@ -357,7 +357,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error disposing recording log stream", ex);
+                    _logger.LogError(ex, "Error disposing recording log stream");
                 }
 
                 _logFileStream = null;
@@ -387,7 +387,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error reading ffmpeg recording log", ex);
+                _logger.LogError(ex, "Error reading ffmpeg recording log");
             }
         }
     }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index 813a7a5f9..9f179dc2c 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -59,7 +59,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error deserializing {0}", ex, jsonFile);
+                Logger.LogError(ex, "Error deserializing {jsonFile}", jsonFile);
             }
             return new List<T>();
         }
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
index f00a54c7f..5618579f6 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
@@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error scheduling wake timer", ex);
+                _logger.LogError(ex, "Error scheduling wake timer");
             }
         }
 
@@ -153,12 +153,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
 
             if (_timers.TryAdd(item.Id, timer))
             {
-                _logger.LogInformation("Creating recording timer for {0}, {1}. Timer will fire in {2} minutes", item.Id, item.Name, dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
+                _logger.LogInformation("Creating recording timer for {id}, {name}. Timer will fire in {minutes} minutes", item.Id, item.Name, dueTime.TotalMinutes.ToString(CultureInfo.InvariantCulture));
             }
             else
             {
                 timer.Dispose();
-                _logger.LogWarning("Timer already exists for item {0}", item.Id);
+                _logger.LogWarning("Timer already exists for item {id}", item.Id);
             }
         }
 
diff --git a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
index 48b4e5833..8fb3af211 100644
--- a/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
+++ b/Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
@@ -527,7 +527,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting image info from schedules direct", ex);
+                _logger.LogError(ex, "Error getting image info from schedules direct");
 
                 return new List<ScheduleDirect.ShowImages>();
             }
@@ -557,35 +557,33 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             try
             {
                 using (var httpResponse = await Get(options, false, info).ConfigureAwait(false))
+                using (Stream responce = httpResponse.Content)
                 {
-                    using (Stream responce = httpResponse.Content)
-                    {
-                        var root = await _jsonSerializer.DeserializeFromStreamAsync<List<ScheduleDirect.Headends>>(responce).ConfigureAwait(false);
+                    var root = await _jsonSerializer.DeserializeFromStreamAsync<List<ScheduleDirect.Headends>>(responce).ConfigureAwait(false);
 
-                        if (root != null)
+                    if (root != null)
+                    {
+                        foreach (ScheduleDirect.Headends headend in root)
                         {
-                            foreach (ScheduleDirect.Headends headend in root)
+                            foreach (ScheduleDirect.Lineup lineup in headend.lineups)
                             {
-                                foreach (ScheduleDirect.Lineup lineup in headend.lineups)
+                                lineups.Add(new NameIdPair
                                 {
-                                    lineups.Add(new NameIdPair
-                                    {
-                                        Name = string.IsNullOrWhiteSpace(lineup.name) ? lineup.lineup : lineup.name,
-                                        Id = lineup.uri.Substring(18)
-                                    });
-                                }
+                                    Name = string.IsNullOrWhiteSpace(lineup.name) ? lineup.lineup : lineup.name,
+                                    Id = lineup.uri.Substring(18)
+                                });
                             }
                         }
-                        else
-                        {
-                            _logger.LogInformation("No lineups available");
-                        }
+                    }
+                    else
+                    {
+                        _logger.LogInformation("No lineups available");
                     }
                 }
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting headends", ex);
+                _logger.LogError(ex, "Error getting headends");
             }
 
             return lineups;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
index cc8840e14..6fe578715 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -170,6 +170,7 @@ namespace Emby.Server.Implementations.LiveTv
                     }
                     catch (Exception ex)
                     {
+                        _logger.LogError(ex, "Error");
                     }
                 }
                 image = librarySeries.GetImageInfo(ImageType.Backdrop, 0);
@@ -185,6 +186,7 @@ namespace Emby.Server.Implementations.LiveTv
                     }
                     catch (Exception ex)
                     {
+                        _logger.LogError(ex, "Error");
                     }
                 }
             }
@@ -212,6 +214,7 @@ namespace Emby.Server.Implementations.LiveTv
                     }
                     catch (Exception ex)
                     {
+                        _logger.LogError(ex, "Error");
                     }
                 }
 
@@ -230,6 +233,7 @@ namespace Emby.Server.Implementations.LiveTv
                         }
                         catch (Exception ex)
                         {
+                            _logger.LogError(ex, "Error");
                         }
                     }
                 }
@@ -260,6 +264,7 @@ namespace Emby.Server.Implementations.LiveTv
                     }
                     catch (Exception ex)
                     {
+                        _logger.LogError(ex, "Error");
                     }
                 }
                 image = librarySeries.GetImageInfo(ImageType.Backdrop, 0);
@@ -275,6 +280,7 @@ namespace Emby.Server.Implementations.LiveTv
                     }
                     catch (Exception ex)
                     {
+                        _logger.LogError(ex, "Error");
                     }
                 }
             }
@@ -333,6 +339,7 @@ namespace Emby.Server.Implementations.LiveTv
                         }
                         catch (Exception ex)
                         {
+                            _logger.LogError(ex, "Error");
                         }
                     }
                 }
@@ -376,7 +383,7 @@ namespace Emby.Server.Implementations.LiveTv
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error getting image info for {0}", ex, info.Name);
+                _logger.LogError(ex, "Error getting image info for {name}", info.Name);
             }
 
             return null;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index 679f8668b..ee2a9fe4b 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1089,7 +1089,7 @@ namespace Emby.Server.Implementations.LiveTv
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                _logger.LogDebug("Refreshing guide from {0}", service.Name);
+                _logger.LogDebug("Refreshing guide from {name}", service.Name);
 
                 try
                 {
@@ -1108,7 +1108,7 @@ namespace Emby.Server.Implementations.LiveTv
                 catch (Exception ex)
                 {
                     cleanDatabase = false;
-                    _logger.LogError("Error refreshing channels for service", ex);
+                    _logger.LogError(ex, "Error refreshing channels for service");
                 }
 
                 numComplete++;
@@ -1171,7 +1171,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting channel information for {0}", ex, channelInfo.Item2.Name);
+                    _logger.LogError(ex, "Error getting channel information for {name}", channelInfo.Item2.Name);
                 }
 
                 numComplete++;
@@ -1300,7 +1300,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting programs for channel {0}", ex, currentChannel.Name);
+                    _logger.LogError(ex, "Error getting programs for channel {name}", currentChannel.Name);
                 }
 
                 numComplete++;
@@ -1645,7 +1645,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting recordings", ex);
+                    _logger.LogError(ex, "Error getting recordings");
                     return new List<Tuple<TimerInfo, ILiveTvService>>();
                 }
             });
@@ -1721,7 +1721,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting recordings", ex);
+                    _logger.LogError(ex, "Error getting recordings");
                     return new List<Tuple<TimerInfo, ILiveTvService>>();
                 }
             });
@@ -1876,7 +1876,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting recordings", ex);
+                    _logger.LogError(ex, "Error getting recordings");
                     return new List<Tuple<SeriesTimerInfo, ILiveTvService>>();
                 }
             });
@@ -1922,7 +1922,7 @@ namespace Emby.Server.Implementations.LiveTv
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error getting recordings", ex);
+                    _logger.LogError(ex, "Error getting recordings");
                     return new List<Tuple<SeriesTimerInfo, ILiveTvService>>();
                 }
             });
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
index 97c33f1fa..ef2010ba6 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
@@ -114,7 +114,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error getting channel list", ex);
+                    Logger.LogError(ex, "Error getting channel list");
 
                     if (enableCache)
                     {
@@ -161,7 +161,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error getting channels", ex);
+                        Logger.LogError(ex, "Error getting channels");
                     }
                 }
             }
@@ -201,7 +201,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error getting channels", ex);
+                    Logger.LogError(ex, "Error getting channels");
                 }
             }
 
@@ -221,7 +221,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error opening tuner", ex);
+                    Logger.LogError(ex, "Error opening tuner");
                 }
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index a8d1dcaa3..be090df0c 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -303,7 +303,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error getting tuner info", ex);
+                    Logger.LogError(ex, "Error getting tuner info");
                 }
             }
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
index 933c34124..c781bccbb 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
@@ -56,7 +56,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
 
             FileSystem.CreateDirectory(FileSystem.GetDirectoryName(TempFilePath));
 
-            Logger.LogInformation("Opening HDHR UDP Live stream from {0}", uri.Host);
+            Logger.LogInformation("Opening HDHR UDP Live stream from {host}", uri.Host);
 
             var remoteAddress = IPAddress.Parse(uri.Host);
             var embyRemoteAddress = _networkManager.ParseIpAddress(uri.Host);
@@ -69,9 +69,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                     localAddress = ((IPEndPoint)tcpSocket.LocalEndPoint).Address;
                     tcpSocket.Close();
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-                    Logger.LogError("Unable to determine local ip address for Legacy HDHomerun stream.");
+                    Logger.LogError(ex, "Unable to determine local ip address for Legacy HDHomerun stream.");
                     return;
                 }
             }
@@ -87,21 +87,19 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             catch (Exception ex)
             {
                 using (udpClient)
+                using (hdHomerunManager)
                 {
-                    using (hdHomerunManager)
+                    if (!(ex is OperationCanceledException))
                     {
-                        if (!(ex is OperationCanceledException))
-                        {
-                            Logger.LogError("Error opening live stream:", ex);
-                        }
-                        throw;
+                        Logger.LogError(ex, "Error opening live stream:");
                     }
+                    throw;
                 }
             }
 
             var taskCompletionSource = new TaskCompletionSource<bool>();
 
-            StartStreaming(udpClient, hdHomerunManager, remoteAddress, taskCompletionSource, LiveStreamCancellationTokenSource.Token);
+            await StartStreaming(udpClient, hdHomerunManager, remoteAddress, taskCompletionSource, LiveStreamCancellationTokenSource.Token);
 
             //OpenedMediaSource.Protocol = MediaProtocol.File;
             //OpenedMediaSource.Path = tempFile;
@@ -122,26 +120,24 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             return Task.Run(async () =>
             {
                 using (udpClient)
+                using (hdHomerunManager)
                 {
-                    using (hdHomerunManager)
+                    try
                     {
-                        try
-                        {
-                            await CopyTo(udpClient, TempFilePath, openTaskCompletionSource, cancellationToken).ConfigureAwait(false);
-                        }
-                        catch (OperationCanceledException ex)
-                        {
-                            Logger.LogInformation("HDHR UDP stream cancelled or timed out from {0}", remoteAddress);
-                            openTaskCompletionSource.TrySetException(ex);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.LogError("Error opening live stream:", ex);
-                            openTaskCompletionSource.TrySetException(ex);
-                        }
-
-                        EnableStreamSharing = false;
+                        await CopyTo(udpClient, TempFilePath, openTaskCompletionSource, cancellationToken).ConfigureAwait(false);
                     }
+                    catch (OperationCanceledException ex)
+                    {
+                        Logger.LogInformation("HDHR UDP stream cancelled or timed out from {0}", remoteAddress);
+                        openTaskCompletionSource.TrySetException(ex);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError(ex, "Error opening live stream:");
+                        openTaskCompletionSource.TrySetException(ex);
+                    }
+
+                    EnableStreamSharing = false;
                 }
 
                 await DeleteTempFiles(new List<string> { TempFilePath }).ConfigureAwait(false);
@@ -166,30 +162,28 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             var resolved = false;
 
             using (var source = _socketFactory.CreateNetworkStream(udpClient, false))
+            using (var fileStream = FileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
             {
-                using (var fileStream = FileSystem.GetFileStream(file, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, FileOpenOptions.None))
-                {
-                    var currentCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, new CancellationTokenSource(TimeSpan.FromSeconds(30)).Token).Token;
+                var currentCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, new CancellationTokenSource(TimeSpan.FromSeconds(30)).Token).Token;
 
-                    while ((read = await source.ReadAsync(buffer, 0, buffer.Length, currentCancellationToken).ConfigureAwait(false)) != 0)
-                    {
-                        cancellationToken.ThrowIfCancellationRequested();
+                while ((read = await source.ReadAsync(buffer, 0, buffer.Length, currentCancellationToken).ConfigureAwait(false)) != 0)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
 
-                        currentCancellationToken = cancellationToken;
+                    currentCancellationToken = cancellationToken;
 
-                        read -= RtpHeaderBytes;
+                    read -= RtpHeaderBytes;
 
-                        if (read > 0)
-                        {
-                            fileStream.Write(buffer, RtpHeaderBytes, read);
-                        }
+                    if (read > 0)
+                    {
+                        fileStream.Write(buffer, RtpHeaderBytes, read);
+                    }
 
-                        if (!resolved)
-                        {
-                            resolved = true;
-                            DateOpened = DateTime.UtcNow;
-                            Resolve(openTaskCompletionSource);
-                        }
+                    if (!resolved)
+                    {
+                        resolved = true;
+                        DateOpened = DateTime.UtcNow;
+                        Resolve(openTaskCompletionSource);
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
index b1eda3b7f..4a2b4ebb2 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
@@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error closing live stream", ex);
+                Logger.LogError(ex, "Error closing live stream");
             }
         }
 
@@ -139,7 +139,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    //Logger.LogError("Error deleting file {0}", ex, path);
+                    Logger.LogError(ex, "Error deleting file {path}", path);
                     failedFiles.Add(path);
                 }
             }
@@ -242,7 +242,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error seeking stream", ex);
+                Logger.LogError(ex, "Error seeking stream");
             }
         }
     }
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
index ca53036a4..9b10daba0 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
@@ -138,7 +138,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error copying live stream.", ex);
+                    Logger.LogError(ex, "Error copying live stream.");
                 }
                 EnableStreamSharing = false;
                 await DeleteTempFiles(new List<string> { TempFilePath }).ConfigureAwait(false);
diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
index 3c7263581..792ffb3c4 100644
--- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -166,7 +166,7 @@ namespace Emby.Server.Implementations.MediaEncoder
                         }
                         catch (Exception ex)
                         {
-                            _logger.LogError("Error extracting chapter images for {0}", ex, string.Join(",", video.Path));
+                            _logger.LogError(ex, "Error extracting chapter images for {0}", string.Join(",", video.Path));
                             success = false;
                             break;
                         }
@@ -226,7 +226,7 @@ namespace Emby.Server.Implementations.MediaEncoder
 
             foreach (var image in deadImages)
             {
-                _logger.LogDebug("Deleting dead chapter image {0}", image);
+                _logger.LogDebug("Deleting dead chapter image {path}", image);
 
                 try
                 {
@@ -234,7 +234,7 @@ namespace Emby.Server.Implementations.MediaEncoder
                 }
                 catch (IOException ex)
                 {
-                    _logger.LogError("Error deleting {0}.", ex, image);
+                    _logger.LogError(ex, "Error deleting {path}.", image);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Networking/NetworkManager.cs b/Emby.Server.Implementations/Networking/NetworkManager.cs
index 7945680b3..260d20e35 100644
--- a/Emby.Server.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Server.Implementations/Networking/NetworkManager.cs
@@ -36,7 +36,7 @@ namespace Emby.Server.Implementations.Networking
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error binding to NetworkAddressChanged event", ex);
+                    Logger.LogError(ex, "Error binding to NetworkAddressChanged event");
                 }
 
                 try
@@ -45,7 +45,7 @@ namespace Emby.Server.Implementations.Networking
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error binding to NetworkChange_NetworkAvailabilityChanged event", ex);
+                    Logger.LogError(ex, "Error binding to NetworkChange_NetworkAvailabilityChanged event");
                 }
             }
         }
@@ -372,7 +372,7 @@ namespace Emby.Server.Implementations.Networking
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error resovling hostname", ex);
+                        Logger.LogError(ex, "Error resolving hostname");
                     }
                 }
             }
@@ -399,7 +399,7 @@ namespace Emby.Server.Implementations.Networking
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error in GetAllNetworkInterfaces", ex);
+                Logger.LogError(ex, "Error in GetAllNetworkInterfaces");
                 return new List<IPAddress>();
             }
 
@@ -428,7 +428,7 @@ namespace Emby.Server.Implementations.Networking
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError("Error querying network interface", ex);
+                    Logger.LogError(ex, "Error querying network interface");
                     return new List<IPAddress>();
                 }
 
diff --git a/Emby.Server.Implementations/News/NewsEntryPoint.cs b/Emby.Server.Implementations/News/NewsEntryPoint.cs
index 95ec2a672..ce6fe6630 100644
--- a/Emby.Server.Implementations/News/NewsEntryPoint.cs
+++ b/Emby.Server.Implementations/News/NewsEntryPoint.cs
@@ -67,7 +67,7 @@ namespace Emby.Server.Implementations.News
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error downloading news", ex);
+                _logger.LogError(ex, "Error downloading news");
             }
         }
 
diff --git a/Emby.Server.Implementations/ResourceFileManager.cs b/Emby.Server.Implementations/ResourceFileManager.cs
index b268e00db..04cf0632c 100644
--- a/Emby.Server.Implementations/ResourceFileManager.cs
+++ b/Emby.Server.Implementations/ResourceFileManager.cs
@@ -59,7 +59,7 @@ namespace Emby.Server.Implementations
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error in Path.GetFullPath", ex);
+                _logger.LogError(ex, "Error in Path.GetFullPath");
             }
 
             // Don't allow file system access outside of the source folder
diff --git a/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
index c77efb5cd..46a7f1f27 100644
--- a/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
@@ -89,11 +89,11 @@ namespace Emby.Server.Implementations.ScheduledTasks
                 }
                 catch (HttpException ex)
                 {
-                    _logger.LogError("Error downloading {0}", ex, package.name);
+                    _logger.LogError(ex, "Error downloading {name}", package.name);
                 }
                 catch (IOException ex)
                 {
-                    _logger.LogError("Error updating {0}", ex, package.name);
+                    _logger.LogError(ex, "Error updating {name}", package.name);
                 }
 
                 // Update progress
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 93e02063b..7c2ce4af3 100644
--- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -146,7 +146,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
                         }
                         catch (Exception ex)
                         {
-                            Logger.LogError("Error deserializing {0}", ex, path);
+                            Logger.LogError(ex, "Error deserializing {path}", path);
                         }
                         _readFromFile = true;
                     }
@@ -436,7 +436,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error", ex);
+                Logger.LogError(ex, "Error");
 
                 failureException = ex;
 
@@ -669,7 +669,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error calling CancellationToken.Cancel();", ex);
+                        Logger.LogError(ex, "Error calling CancellationToken.Cancel();");
                     }
                 }
                 var task = _currentTask;
@@ -691,7 +691,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error calling Task.WaitAll();", ex);
+                        Logger.LogError(ex, "Error calling Task.WaitAll();");
                     }
                 }
 
@@ -704,7 +704,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError("Error calling CancellationToken.Dispose();", ex);
+                        Logger.LogError(ex, "Error calling CancellationToken.Dispose();");
                     }
                 }
                 if (wassRunning)
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
index efadd7111..c60f59ce4 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -132,11 +132,11 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
                     }
                     catch (UnauthorizedAccessException ex)
                     {
-                        _logger.LogError("Error deleting directory {0}", ex, directory);
+                        _logger.LogError(ex, "Error deleting directory {path}", directory);
                     }
                     catch (IOException ex)
                     {
-                        _logger.LogError("Error deleting directory {0}", ex, directory);
+                        _logger.LogError(ex, "Error deleting directory {path}", directory);
                     }
                 }
             }
@@ -150,11 +150,11 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             }
             catch (UnauthorizedAccessException ex)
             {
-                _logger.LogError("Error deleting file {0}", ex, path);
+                _logger.LogError(ex, "Error deleting file {path}", path);
             }
             catch (IOException ex)
             {
-                _logger.LogError("Error deleting file {0}", ex, path);
+                _logger.LogError(ex, "Error deleting file {path}", path);
             }
         }
 
diff --git a/Emby.Server.Implementations/Security/AuthenticationRepository.cs b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
index d2c6ed33b..228d511ce 100644
--- a/Emby.Server.Implementations/Security/AuthenticationRepository.cs
+++ b/Emby.Server.Implementations/Security/AuthenticationRepository.cs
@@ -83,7 +83,7 @@ namespace Emby.Server.Implementations.Security
             }
             catch (Exception ex)
             {
-                Logger.LogError("Error migrating authentication database", ex);
+                Logger.LogError(ex, "Error migrating authentication database");
             }
         }
 
diff --git a/Emby.Server.Implementations/Security/PluginSecurityManager.cs b/Emby.Server.Implementations/Security/PluginSecurityManager.cs
index aa0f39030..2b1494c39 100644
--- a/Emby.Server.Implementations/Security/PluginSecurityManager.cs
+++ b/Emby.Server.Implementations/Security/PluginSecurityManager.cs
@@ -150,18 +150,15 @@ namespace Emby.Server.Implementations.Security
                 SaveAppStoreInfo(parameters);
                 throw;
             }
-            catch (HttpException e)
+            catch (HttpException ex)
             {
-                _logger.LogError("Error registering appstore purchase {0}", e, parameters ?? "NO PARMS SENT");
+                _logger.LogError(ex, "Error registering appstore purchase {parameters}", parameters ?? "NO PARMS SENT");
 
-                if (e.StatusCode.HasValue && e.StatusCode.Value == HttpStatusCode.PaymentRequired)
-                {
-                }
                 throw new Exception("Error registering store sale");
             }
-            catch (Exception e)
+            catch (Exception ex)
             {
-                _logger.LogError("Error registering appstore purchase {0}", e, parameters ?? "NO PARMS SENT");
+                _logger.LogError(ex, "Error registering appstore purchase {parameters}", parameters ?? "NO PARMS SENT");
                 SaveAppStoreInfo(parameters);
                 //TODO - could create a re-try routine on start-up if this file is there.  For now we can handle manually.
                 throw new Exception("Error registering store sale");
diff --git a/Emby.Server.Implementations/Udp/UdpServer.cs b/Emby.Server.Implementations/Udp/UdpServer.cs
index 222ec7dd0..8cacc1124 100644
--- a/Emby.Server.Implementations/Udp/UdpServer.cs
+++ b/Emby.Server.Implementations/Udp/UdpServer.cs
@@ -79,7 +79,7 @@ namespace Emby.Server.Implementations.Udp
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError("Error in OnMessageReceived", ex);
+                    _logger.LogError(ex, "Error in OnMessageReceived");
                 }
             }
         }
@@ -171,7 +171,7 @@ namespace Emby.Server.Implementations.Udp
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error receiving udp message", ex);
+                _logger.LogError(ex, "Error receiving udp message");
             }
         }
 
@@ -193,7 +193,7 @@ namespace Emby.Server.Implementations.Udp
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error receiving udp message", ex);
+                _logger.LogError(ex, "Error receiving udp message");
             }
 
             BeginReceive();
@@ -224,7 +224,7 @@ namespace Emby.Server.Implementations.Udp
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error handling UDP message", ex);
+                _logger.LogError(ex, "Error handling UDP message");
             }
         }
 
@@ -274,7 +274,7 @@ namespace Emby.Server.Implementations.Udp
             {
                 await _udpClient.SendToAsync(bytes, 0, bytes.Length, remoteEndPoint, cancellationToken).ConfigureAwait(false);
 
-                _logger.LogInformation("Udp message sent to {0}", remoteEndPoint);
+                _logger.LogInformation("Udp message sent to {remoteEndPoint}", remoteEndPoint);
             }
             catch (OperationCanceledException)
             {
@@ -282,7 +282,7 @@ namespace Emby.Server.Implementations.Udp
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error sending message to {0}", ex, remoteEndPoint);
+                _logger.LogError(ex, "Error sending message to {remoteEndPoint}", remoteEndPoint);
             }
         }
     }
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index f864b079a..b4d18b69c 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -499,7 +499,7 @@ namespace Emby.Server.Implementations.Updates
             }
             catch (Exception ex)
             {
-                _logger.LogError("Package installation failed", ex);
+                _logger.LogError(ex, "Package installation failed");
 
                 lock (CurrentInstallations)
                 {
@@ -610,9 +610,9 @@ namespace Emby.Server.Implementations.Updates
                     _fileSystem.WriteAllText(target + ".ver", package.versionStr);
                 }
             }
-            catch (IOException e)
+            catch (IOException ex)
             {
-                _logger.LogError("Error attempting to move file from {0} to {1}", e, tempFile, target);
+                _logger.LogError(ex, "Error attempting to move file from {TempFile} to {TargetFile}", tempFile, target);
                 throw;
             }
 
@@ -620,10 +620,10 @@ namespace Emby.Server.Implementations.Updates
             {
                 _fileSystem.DeleteFile(tempFile);
             }
-            catch (IOException e)
+            catch (IOException ex)
             {
                 // Don't fail because of this
-                _logger.LogError("Error deleting temp file {0]", e, tempFile);
+                _logger.LogError(ex, "Error deleting temp file {TempFile}", tempFile);
             }
         }