diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs
index e71162ce7..ab60beb00 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs
@@ -44,9 +44,9 @@ public class ArtifactsSizeTest : SmokeTests
     [SkippableFact(Config.IncludeArtifactsSizeEnv, skipOnFalseEnv: true)]
     public void CompareArtifactsToBaseline()
     {
-        OutputHelper.LogAndThrowIfNullOrEmpty(Config.SourceBuiltArtifactsPath, Config.SourceBuiltArtifactsPathEnv);
-        OutputHelper.LogAndThrowIfNullOrEmpty(Config.SdkTarballPath, Config.SdkTarballPathEnv);
-        OutputHelper.LogAndThrowIfNullOrEmpty(Config.TargetRid, Config.TargetRidEnv);
+        Utilities.ValidateNotNullOrWhiteSpace(Config.SourceBuiltArtifactsPath, Config.SourceBuiltArtifactsPathEnv);
+        Utilities.ValidateNotNullOrWhiteSpace(Config.SdkTarballPath, Config.SdkTarballPathEnv);
+        Utilities.ValidateNotNullOrWhiteSpace(Config.TargetRid, Config.TargetRidEnv);
 
         var tarEntries = ProcessSdkAndArtifactsTarballs();
 
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs
index e95303192..c1314e19e 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs
@@ -30,18 +30,15 @@ internal class SkippableFactAttribute : FactAttribute
                 setSkip($"Skipping because `{envName}` is null or whitespace");
                 break;
             }
-            else if ((skipOnTrueEnv || skipOnFalseEnv) && bool.TryParse(envValue, out bool boolValue))
+            else if (skipOnTrueEnv && bool.TryParse(envValue, out bool boolValue) && boolValue)
             {
-                if (skipOnTrueEnv && boolValue)
-                {
-                    setSkip($"Skipping because `{envName}` is set to True");
-                    break;
-                }
-                else if (skipOnFalseEnv && !boolValue)
-                {
-                    setSkip($"Skipping because `{envName}` is set to False");
-                    break;
-                }
+                setSkip($"Skipping because `{envName}` is set to True");
+                break;
+            }
+            else if (skipOnFalseEnv && (!bool.TryParse(envValue, out boolValue) || !boolValue))
+            {
+                setSkip($"Skipping because `{envName}` is set to False or an invalid value");
+                break;
             }
         }
 
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
index d46d8425b..ba5150bf5 100644
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Utilities.cs
@@ -115,16 +115,11 @@ public static class Utilities
         outputHelper.WriteLine("##vso[task.complete result=SucceededWithIssues;]");
     }
 
-    public static void LogAndThrowIfNullOrEmpty(this ITestOutputHelper outputHelper, string? variable, string variableName)
+    public static void ValidateNotNullOrWhiteSpace(string? variable, string variableName)
     {
-        if (string.IsNullOrEmpty(variable) || string.IsNullOrWhiteSpace(variable))
+        if (string.IsNullOrWhiteSpace(variable))
         {
-            string prefix = "##vso[task.logissue type=error;]";
-            string message = $"{variableName} is null, empty, or whitespace.";
-
-            outputHelper.WriteLine($"{Environment.NewLine}{prefix}{message}.{Environment.NewLine}");
-
-            throw new ArgumentException(message);
+            throw new ArgumentException($"{variableName} is null, empty, or whitespace.");
         }
     }
 }