diff --git a/client/src/main/scala/raw/client/api/CompilerService.scala b/client/src/main/scala/raw/client/api/CompilerService.scala
index c21620eee..4ba829ae2 100644
--- a/client/src/main/scala/raw/client/api/CompilerService.scala
+++ b/client/src/main/scala/raw/client/api/CompilerService.scala
@@ -44,7 +44,7 @@ object CompilerService {
           options.put("engine.CompileImmediately", "true")
           options.put("engine.TraceCompilation", "true")
           options.put("engine.BackgroundCompilation", "false")
-          options.put("engine.CompilationFailureAction", "Throw")
+          // options.put("engine.CompilationFailureAction", "Throw")
           //      options.put("engine.CompilationFailureAction", "Diagnose")
           //      options.put("compiler.LogInlinedTargets", "true")
           //  "-Dpolyglotimpl.CompilationFailureAction=Throw",
diff --git a/snapi-client/build.sbt b/snapi-client/build.sbt
index 5ab18061b..5cecc606a 100644
--- a/snapi-client/build.sbt
+++ b/snapi-client/build.sbt
@@ -119,7 +119,8 @@ Test / javaOptions ++= Seq(
   // Limit overall memory and force crashing hard and early.
   // Useful for debugging memleaks.
   "-Xmx8G",
-  "-XX:+CrashOnOutOfMemoryError"
+  "-XX:+CrashOnOutOfMemoryError",
+  "-Dpolyglotimpl.CompilationFailureAction=Throw"
 )
 
 // Add dependency resolvers
diff --git a/snapi-frontend/build.sbt b/snapi-frontend/build.sbt
index 77cacc65a..0b44f2a30 100644
--- a/snapi-frontend/build.sbt
+++ b/snapi-frontend/build.sbt
@@ -117,7 +117,8 @@ Test / javaOptions ++= Seq(
   // Limit overall memory and force crashing hard and early.
   // Useful for debugging memleaks.
   "-Xmx8G",
-  "-XX:+CrashOnOutOfMemoryError"
+  "-XX:+CrashOnOutOfMemoryError",
+  "-Dpolyglotimpl.CompilationFailureAction=Throw"
 )
 
 // Add dependency resolvers
diff --git a/snapi-truffle/build.sbt b/snapi-truffle/build.sbt
index 87c348026..809ac29d1 100644
--- a/snapi-truffle/build.sbt
+++ b/snapi-truffle/build.sbt
@@ -117,7 +117,8 @@ Test / javaOptions ++= Seq(
   // Limit overall memory and force crashing hard and early.
   // Useful for debugging memleaks.
   "-Xmx8G",
-  "-XX:+CrashOnOutOfMemoryError"
+  "-XX:+CrashOnOutOfMemoryError",
+  "-Dpolyglotimpl.CompilationFailureAction=Throw"
 )
 
 // Add dependency resolvers
diff --git a/sql-client/build.sbt b/sql-client/build.sbt
index 35f34d466..8d351a722 100644
--- a/sql-client/build.sbt
+++ b/sql-client/build.sbt
@@ -118,7 +118,8 @@ Test / javaOptions ++= Seq(
   // Limit overall memory and force crashing hard and early.
   // Useful for debugging memleaks.
   "-Xmx8G",
-  "-XX:+CrashOnOutOfMemoryError"
+  "-XX:+CrashOnOutOfMemoryError",
+  "-Dpolyglotimpl.CompilationFailureAction=Throw"
 )
 
 // Add dependency resolvers