diff --git a/Dalamud/Troubleshooting.cs b/Dalamud/Troubleshooting.cs
index bec723e3c..97b88c591 100644
--- a/Dalamud/Troubleshooting.cs
+++ b/Dalamud/Troubleshooting.cs
@@ -47,27 +47,25 @@ namespace Dalamud
///
/// Log troubleshooting information in a parseable format to Serilog.
///
- /// The instance to read information from.
- /// Whether or not the interface was loaded.
- internal static void LogTroubleshooting(Dalamud dalamud, bool isInterfaceLoaded)
+ internal static void LogTroubleshooting()
{
- var interfaceManager = Service.Get();
var startInfo = Service.Get();
- var pluginManager = Service.Get();
var configuration = Service.Get();
+ var interfaceManager = Service.GetNullable();
+ var pluginManager = Service.GetNullable();
try
{
var payload = new TroubleshootingPayload
{
- LoadedPlugins = pluginManager.InstalledPlugins.Select(x => x.Manifest).ToArray(),
+ LoadedPlugins = pluginManager?.InstalledPlugins?.Select(x => x.Manifest)?.ToArray(),
DalamudVersion = Util.AssemblyVersion,
DalamudGitHash = Util.GetGitHash(),
GameVersion = startInfo.GameVersion.ToString(),
Language = startInfo.Language.ToString(),
DoDalamudTest = configuration.DoDalamudTest,
DoPluginTest = configuration.DoPluginTest,
- InterfaceLoaded = interfaceManager.IsReady,
+ InterfaceLoaded = interfaceManager?.IsReady ?? false,
ThirdRepo = configuration.ThirdRepoList,
};