diff --git a/PrinterControls/TerminalWindow/TerminalWidget.cs b/PrinterControls/TerminalWindow/TerminalWidget.cs
index 5ebebc7f3..d76714ba6 100644
--- a/PrinterControls/TerminalWindow/TerminalWidget.cs
+++ b/PrinterControls/TerminalWindow/TerminalWidget.cs
@@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl
                         {
                             if (filterOutput.Checked)
                             {
-                                textScrollWidget.SetLineStartFilter(new string[] { "<-wait", "<-ok", "->M105" });
+                                textScrollWidget.SetLineStartFilter(new string[] { "<-wait", "<-ok", "->M105", "<-T"});
                             }
                             else
                             {
diff --git a/PrinterControls/TerminalWindow/TextScrollWidget.cs b/PrinterControls/TerminalWindow/TextScrollWidget.cs
index 84d0274f8..584cb7d42 100644
--- a/PrinterControls/TerminalWindow/TextScrollWidget.cs
+++ b/PrinterControls/TerminalWindow/TextScrollWidget.cs
@@ -97,7 +97,9 @@ namespace MatterHackers.MatterControl
                 bool lineIsVisible = true;
                 foreach (string startFilter in StartLineStringFilters)
                 {
-                    if (line.StartsWith(startFilter))
+                    if (line != null
+                        && line.Length > 3
+                        && line.StartsWith(startFilter))
                     {
                         lineIsVisible = false;
                         break;