diff --git a/src/Tools/PublicApi/mark-shipped.ps1 b/src/Tools/PublicApi/mark-shipped.ps1
index 37589ad939128df1766055ad524224a1924f11a9..f9fbb6e57d863dfe88ba83a81053623e8b69c18c 100644
--- a/src/Tools/PublicApi/mark-shipped.ps1
+++ b/src/Tools/PublicApi/mark-shipped.ps1
@@ -14,16 +14,18 @@ function MarkShipped([string]$dir) {
     Write-Host "Processing $dir"
 
     foreach ($item in $unshipped) {
-        if ($item.StartsWith($removedPrefix)) {
-            $item = $item.Substring($removedPrefix.Length)
-            $removed += $item
-        }
-        else {
-            $shipped += $item
+        if ($item.Length -gt 0) {
+            if ($item.StartsWith($removedPrefix)) {
+                $item = $item.Substring($removedPrefix.Length)
+                $removed += $item
+            }
+            else {
+                $shipped += $item
+            }
         }
     }
 
-    $shipped | Sort-Object | ?{ -not $removed.Contains($_) } |  Out-File $shippedFilePath -Encoding Ascii
+    $shipped | Sort-Object | ?{ -not $removed.Contains($_) } | Out-File $shippedFilePath -Encoding Ascii
     "" | Out-File $unshippedFilePath -Encoding Ascii
 }