diff --git a/eng/Versions.props b/eng/Versions.props
index 7867da3b406..e1b85c3b2a1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
 <Project>
   <Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
   <PropertyGroup>
-    <VersionPrefix>18.0.7</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
+    <VersionPrefix>18.0.8</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
     <PackageValidationBaselineVersion>17.14.8</PackageValidationBaselineVersion>
     <AssemblyVersion>15.1.0.0</AssemblyVersion>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
diff --git a/src/Build/Logging/TerminalLogger/TerminalLogger.cs b/src/Build/Logging/TerminalLogger/TerminalLogger.cs
index b64fefb705e..900710212f4 100644
--- a/src/Build/Logging/TerminalLogger/TerminalLogger.cs
+++ b/src/Build/Logging/TerminalLogger/TerminalLogger.cs
@@ -1100,30 +1100,38 @@ private void MessageRaised(object sender, BuildMessageEventArgs e)
 
             if (hasProject && project!.IsTestProject)
             {
-                var node = _nodes[NodeIndexForContext(buildEventContext)];
+                TerminalNodeStatus? node = _nodes[NodeIndexForContext(buildEventContext)];
 
                 // Consumes test update messages produced by VSTest and MSTest runner.
-                if (node != null && e is IExtendedBuildEventArgs extendedMessage)
+                if (e is IExtendedBuildEventArgs extendedMessage)
                 {
                     switch (extendedMessage.ExtendedType)
                     {
                         case "TLTESTPASSED":
                             {
-                                var indicator = extendedMessage.ExtendedMetadata!["localizedResult"]!;
-                                var displayName = extendedMessage.ExtendedMetadata!["displayName"]!;
+                                if (node != null)
+                                {
+                                    var indicator = extendedMessage.ExtendedMetadata!["localizedResult"]!;
+                                    var displayName = extendedMessage.ExtendedMetadata!["displayName"]!;
+
+                                    var status = new TerminalNodeStatus(node.Project, node.TargetFramework, node.RuntimeIdentifier, TerminalColor.Green, indicator, displayName, project.Stopwatch);
+                                    UpdateNodeStatus(buildEventContext, status);
+                                }
 
-                                var status = new TerminalNodeStatus(node.Project, node.TargetFramework, node.RuntimeIdentifier, TerminalColor.Green, indicator, displayName, project.Stopwatch);
-                                UpdateNodeStatus(buildEventContext, status);
                                 break;
                             }
 
                         case "TLTESTSKIPPED":
                             {
-                                var indicator = extendedMessage.ExtendedMetadata!["localizedResult"]!;
-                                var displayName = extendedMessage.ExtendedMetadata!["displayName"]!;
+                                if (node != null)
+                                {
+                                    var indicator = extendedMessage.ExtendedMetadata!["localizedResult"]!;
+                                    var displayName = extendedMessage.ExtendedMetadata!["displayName"]!;
+
+                                    var status = new TerminalNodeStatus(node.Project, node.TargetFramework, node.RuntimeIdentifier, TerminalColor.Yellow, indicator, displayName, project.Stopwatch);
+                                    UpdateNodeStatus(buildEventContext, status);
+                                }
 
-                                var status = new TerminalNodeStatus(node.Project, node.TargetFramework, node.RuntimeIdentifier, TerminalColor.Yellow, indicator, displayName, project.Stopwatch);
-                                UpdateNodeStatus(buildEventContext, status);
                                 break;
                             }