From 9ff57629c5afb2f0fd4aee84cda79c9a6f7962d0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <janober@users.noreply.github.com>
Date: Mon, 13 Jun 2022 11:48:02 -0700
Subject: [PATCH] fix(core): Fix issue with combined expression not resolving
 if one is invalid (#3506)

---
 packages/workflow/src/Expression.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index cb1f20afe5..ac838541ae 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -26,7 +26,11 @@ tmpl.brackets.set('{{ }}');
 // Make sure that error get forwarded
 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 tmpl.tmpl.errorHandler = (error: Error) => {
-	throw error;
+	if (error instanceof ExpressionError) {
+		if (error.context.failExecution) {
+			throw error;
+		}
+	}
 };
 
 export class Expression {