@@ -416,10 +416,12 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
 
             for (int k = 0; k < lines.Length; k++)
             {
-                if (lines[k] == null || displayCells.Length(lines[k]) <= firstLineLen)
+                var currentLine = lines[k];
+
+                if (currentLine == null || displayCells.Length(currentLine) <= firstLineLen)
                 {
                     // we do not need to split further, just add
-                    retVal.Add(lines[k]);
+                    retVal.Add(currentLine);
                     continue;
                 }
 
@@ -432,15 +434,15 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
 
                 int offset = 0; // offset into the line we are splitting
 
-                while (true)
+                while (currentLine.Length > offset)
                 {
                     // acquire the current active display line length (it can very from call to call)
                     int currentDisplayLen = accumulator.ActiveLen;
 
                     // determine if the current tail would fit or not
 
                     // for the remaining part of the string, determine its display cell count
-                    int currentCellsToFit = displayCells.Length(lines[k], offset);
+                    int currentCellsToFit = displayCells.Length(currentLine, offset);
 
                     // determine if we fit into the line
                     int excessCells = currentCellsToFit - currentDisplayLen;
@@ -449,7 +451,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
                     {
                         // we are not at the end of the string, select a sub string
                         // that would fit in the remaining display length
-                        int charactersToAdd = displayCells.GetHeadSplitLength(lines[k], offset, currentDisplayLen);
+                        int charactersToAdd = displayCells.GetHeadSplitLength(currentLine, offset, currentDisplayLen);
 
                         if (charactersToAdd <= 0)
                         {
@@ -463,7 +465,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
                         else
                         {
                             // of the given length, add it to the accumulator
-                            accumulator.AddLine(lines[k].Substring(offset, charactersToAdd));
+                            accumulator.AddLine(currentLine.Substring(offset, charactersToAdd));
                         }
 
                         // increase the offset by the # of characters added
@@ -472,7 +474,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa
                     else
                     {
                         // we reached the last (partial) line, we add it all
-                        accumulator.AddLine(lines[k].Substring(offset));
+                        accumulator.AddLine(currentLine.Substring(offset));
                         break;
                     }
                 }
 
@@ -87,8 +87,15 @@ internal DisplayCellsPSHost(PSHostRawUserInterface rawUserInterface)
 
         internal override int Length(string str, int offset)
         {
-            Dbg.Assert(offset >= 0, "offset >= 0");
-            Dbg.Assert(string.IsNullOrEmpty(str) || (offset < str.Length), "offset < str.Length");
+            if (string.IsNullOrEmpty(str))
+            {
+                return 0;
+            }
+
+            if (offset < 0 || offset >= str.Length)
+            {
+                throw PSTraceSource.NewArgumentException(nameof(offset));
+            }
 
             try
             {
@@ -100,7 +107,7 @@ internal override int Length(string str, int offset)
                 // we will fallback to the default value.
             }
 
-            return string.IsNullOrEmpty(str) ? 0 : str.Length - offset;
+            return str.Length - offset;
         }
 
         internal override int Length(string str)
Original file line number	Diff line number	Diff line change
`@@ -416,10 +416,12 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa`
`416`	`416`
`417`	`417`	`for (int k = 0; k < lines.Length; k++)`
`418`	`418`	`{`
`419`		`- if (lines[k] == null \|\| displayCells.Length(lines[k]) <= firstLineLen)`
	`419`	`+ var currentLine = lines[k];`
	`420`	`+`
	`421`	`+ if (currentLine == null \|\| displayCells.Length(currentLine) <= firstLineLen)`
`420`	`422`	`{`
`421`	`423`	`// we do not need to split further, just add`
`422`		`- retVal.Add(lines[k]);`
	`424`	`+ retVal.Add(currentLine);`
`423`	`425`	`continue;`
`424`	`426`	`}`
`425`	`427`
`@@ -432,15 +434,15 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa`
`432`	`434`
`433`	`435`	`int offset = 0; // offset into the line we are splitting`
`434`	`436`
`435`		`- while (true)`
	`437`	`+ while (currentLine.Length > offset)`
`436`	`438`	`{`
`437`	`439`	`// acquire the current active display line length (it can very from call to call)`
`438`	`440`	`int currentDisplayLen = accumulator.ActiveLen;`
`439`	`441`
`440`	`442`	`// determine if the current tail would fit or not`
`441`	`443`
`442`	`444`	`// for the remaining part of the string, determine its display cell count`
`443`		`- int currentCellsToFit = displayCells.Length(lines[k], offset);`
	`445`	`+ int currentCellsToFit = displayCells.Length(currentLine, offset);`
`444`	`446`
`445`	`447`	`// determine if we fit into the line`
`446`	`448`	`int excessCells = currentCellsToFit - currentDisplayLen;`
`@@ -449,7 +451,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa`
`449`	`451`	`{`
`450`	`452`	`// we are not at the end of the string, select a sub string`
`451`	`453`	`// that would fit in the remaining display length`
`452`		`- int charactersToAdd = displayCells.GetHeadSplitLength(lines[k], offset, currentDisplayLen);`
	`454`	`+ int charactersToAdd = displayCells.GetHeadSplitLength(currentLine, offset, currentDisplayLen);`
`453`	`455`
`454`	`456`	`if (charactersToAdd <= 0)`
`455`	`457`	`{`
`@@ -463,7 +465,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa`
`463`	`465`	`else`
`464`	`466`	`{`
`465`	`467`	`// of the given length, add it to the accumulator`
`466`		`- accumulator.AddLine(lines[k].Substring(offset, charactersToAdd));`
	`468`	`+ accumulator.AddLine(currentLine.Substring(offset, charactersToAdd));`
`467`	`469`	`}`
`468`	`470`
`469`	`471`	`// increase the offset by the # of characters added`
`@@ -472,7 +474,7 @@ private static StringCollection GenerateLinesWithoutWordWrap(DisplayCells displa`
`472`	`474`	`else`
`473`	`475`	`{`
`474`	`476`	`// we reached the last (partial) line, we add it all`
`475`		`- accumulator.AddLine(lines[k].Substring(offset));`
	`477`	`+ accumulator.AddLine(currentLine.Substring(offset));`
`476`	`478`	`break;`
`477`	`479`	`}`
`478`	`480`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,15 @@ internal DisplayCellsPSHost(PSHostRawUserInterface rawUserInterface)`
`87`	`87`
`88`	`88`	`internal override int Length(string str, int offset)`
`89`	`89`	`{`
`90`		`- Dbg.Assert(offset >= 0, "offset >= 0");`
`91`		`- Dbg.Assert(string.IsNullOrEmpty(str) \|\| (offset < str.Length), "offset < str.Length");`
	`90`	`+ if (string.IsNullOrEmpty(str))`
	`91`	`+ {`
	`92`	`+ return 0;`
	`93`	`+ }`
	`94`	`+`
	`95`	`+ if (offset < 0 \|\| offset >= str.Length)`
	`96`	`+ {`
	`97`	`+ throw PSTraceSource.NewArgumentException(nameof(offset));`
	`98`	`+ }`
`92`	`99`
`93`	`100`	`try`
`94`	`101`	`{`
`@@ -100,7 +107,7 @@ internal override int Length(string str, int offset)`
`100`	`107`	`// we will fallback to the default value.`
`101`	`108`	`}`
`102`	`109`
`103`		`- return string.IsNullOrEmpty(str) ? 0 : str.Length - offset;`
	`110`	`+ return str.Length - offset;`
`104`	`111`	`}`
`105`	`112`
`106`	`113`	`internal override int Length(string str)`