1 files changed, 1 insertions, 1 deletions

diff --git a/src/WixToolset.Core/VariableResolver.cs b/src/WixToolset.Core/VariableResolver.cs
index 0a7916a3..4a65bec2 100644
--- a/src/WixToolset.Core/VariableResolver.cs
+++ b/src/WixToolset.Core/VariableResolver.cs
@@ -94,7 +94,7 @@ namespace WixToolset.Core
             result.IsDefault = true;
             result.Value = value;
 
-            while (!result.DelayedResolve && matches.Count > 0)
+            while (!this.Messaging.EncounteredError && !result.DelayedResolve && matches.Count > 0)
             {
                 var sb = new StringBuilder(value);