From d489319cbbd20d2071934889c405a6fa5a6579c3 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 7 Jan 2026 14:02:22 -0800
Subject: [PATCH] Update exception message

---
 .../CommandCompletion/CompletionResult.cs       | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionResult.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionResult.cs
index ffb09e2a50d..0554a52ba17 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionResult.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionResult.cs
@@ -168,26 +168,15 @@ internal static CompletionResult Null
         /// <param name="toolTip">The text for the tooltip with details to be displayed about the object.</param>
         public CompletionResult(string completionText, string listItemText, CompletionResultType resultType, string toolTip)
         {
-            if (string.IsNullOrEmpty(completionText))
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(completionText));
-            }
-
-            if (string.IsNullOrEmpty(listItemText))
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(listItemText));
-            }
+            ArgumentException.ThrowIfNullOrEmpty(completionText);
+            ArgumentException.ThrowIfNullOrEmpty(listItemText);
+            ArgumentException.ThrowIfNullOrEmpty(toolTip);
 
             if (resultType < CompletionResultType.Text || resultType > CompletionResultType.DynamicKeyword)
             {
                 throw PSTraceSource.NewArgumentOutOfRangeException(nameof(resultType), resultType);
             }
 
-            if (string.IsNullOrEmpty(toolTip))
-            {
-                throw PSTraceSource.NewArgumentNullException(nameof(toolTip));
-            }
-
             _completionText = completionText;
             _listItemText = listItemText;
             _toolTip = toolTip;