1 files changed, 4 insertions, 15 deletions
diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index d52c0b2a1..a805924dd 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -126,7 +126,8 @@ namespace Emby.Server.Implementations.Plugins
                     {
                         assembly = Assembly.LoadFrom(file);
 
-                        assembly.GetExportedTypes();
+                        // Load all required types to verify that the plugin will load
+                        assembly.GetTypes();
                     }
                     catch (FileLoadException ex)
                     {
@@ -134,7 +135,7 @@ namespace Emby.Server.Implementations.Plugins
                         ChangePluginState(plugin, PluginStatus.Malfunctioned);
                         continue;
                     }
-                    catch (TypeLoadException ex) // Undocumented exception
+                    catch (SystemException ex) when (ex is TypeLoadException or ReflectionTypeLoadException) // Undocumented exception
                     {
                         _logger.LogError(ex, "Failed to load assembly {Path}. This error occurs when a plugin references an incompatible version of one of the shared libraries. Disabling plugin.", file);
                         ChangePluginState(plugin, PluginStatus.NotSupported);
@@ -359,11 +360,6 @@ namespace Emby.Server.Implementations.Plugins
         /// <inheritdoc/>
         public async Task<bool> GenerateManifest(PackageInfo packageInfo, Version version, string path, PluginStatus status)
         {
-            if (packageInfo == null)
-            {
-                return false;
-            }
-
             var versionInfo = packageInfo.Versions.First(v => v.Version == version.ToString());
             var imagePath = string.Empty;
 
@@ -616,7 +612,7 @@ namespace Emby.Server.Implementations.Plugins
             if (versionIndex != -1)
             {
                 // Get the version number from the filename if possible.
-                metafile = Path.GetFileName(dir[..versionIndex]) ?? dir[..versionIndex];
+                metafile = Path.GetFileName(dir[..versionIndex]);
                 version = Version.TryParse(dir.AsSpan()[(versionIndex + 1)..], out Version? parsedVersion) ? parsedVersion : _appVersion;
             }
             else
@@ -681,7 +677,6 @@ namespace Emby.Server.Implementations.Plugins
                     continue;
                 }
 
-                var manifest = entry.Manifest;
                 var cleaned = false;
                 var path = entry.Path;
                 if (_config.RemoveOldPlugins)
@@ -706,12 +701,6 @@ namespace Emby.Server.Implementations.Plugins
                     }
                     else
                     {
-                        if (manifest == null)
-                        {
-                            _logger.LogWarning("Unable to disable plugin {Path}", entry.Path);
-                            continue;
-                        }
-
                         ChangePluginState(entry, PluginStatus.Deleted);
                     }
                 }