diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs
index 213055af3..cefa34f5e 100644
--- a/Dalamud/Interface/Internal/InterfaceManager.cs
+++ b/Dalamud/Interface/Internal/InterfaceManager.cs
@@ -15,6 +15,7 @@ using Dalamud.Game.Gui.Internal;
 using Dalamud.Game.Internal.DXGI;
 using Dalamud.Hooking;
 using Dalamud.Hooking.Internal;
+using Dalamud.Interface.Internal.ManagedAsserts;
 using Dalamud.Interface.Internal.Notifications;
 using Dalamud.Interface.Windowing;
 using Dalamud.Utility;
@@ -631,7 +632,10 @@ namespace Dalamud.Interface.Internal
             WindowSystem.HasAnyWindowSystemFocus = false;
             WindowSystem.FocusedWindowSystemNamespace = string.Empty;
 
+            var snap = ImGuiManagedAsserts.GetSnapshot();
             this.Draw?.Invoke();
+            ImGuiManagedAsserts.ReportProblems("Dalamud Core", snap);
+
             Service<NotificationManager>.Get().Draw();
         }
     }
diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs
index 5ff2fac4c..7811ccd00 100644
--- a/Dalamud/Interface/UiBuilder.cs
+++ b/Dalamud/Interface/UiBuilder.cs
@@ -276,7 +276,7 @@ namespace Dalamud.Interface
                 ImGui.End();
             }
 
-            ImGuiManagedAsserts.ImGuiContextSnapshot? snapshot = null;
+            ImGuiManagedAsserts.ImGuiContextSnapshot snapshot = null;
             if (this.Draw != null)
             {
                 snapshot = ImGuiManagedAsserts.GetSnapshot();
@@ -296,7 +296,7 @@ namespace Dalamud.Interface
             }
 
             // Only if Draw was successful
-            if (this.Draw != null && snapshot != null)
+            if (this.Draw != null)
             {
                 ImGuiManagedAsserts.ReportProblems(this.namespaceName, snapshot);
             }