diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 0273cc91..b2b9f831 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -43,6 +43,7 @@
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
+    <import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -105,6 +106,10 @@
       <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
         <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
       </concept>
+      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
+        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
+        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
+      </concept>
       <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
         <child id="1164879758292" name="body" index="SfCbr" />
         <child id="1164903496223" name="catchClause" index="TEbGg" />
@@ -924,6 +929,144 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="8odmgCo0jL" role="3cqZAp">
+          <node concept="37vLTI" id="8odmgCo34v" role="3clFbG">
+            <node concept="2OqwBi" id="8odmgCo4nu" role="37vLTx">
+              <node concept="37vLTw" id="8odmgCo4hH" role="2Oq$k0">
+                <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+              </node>
+              <node concept="liA8E" id="8odmgCo4yk" role="2OqNvi">
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withFailureHandler(jetbrains.mps.logic.reactor.evaluation.FailureHandler):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withFailureHandler" />
+                <node concept="2ShNRf" id="8odmgCo4zw" role="37wK5m">
+                  <node concept="YeOm9" id="8odmgCo4Lc" role="2ShVmc">
+                    <node concept="1Y3b0j" id="8odmgCo4Lf" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="1Y3XeK" to="w7la:~FailureHandler" resolve="FailureHandler" />
+                      <node concept="3Tm1VV" id="8odmgCo4Lg" role="1B3o_S" />
+                      <node concept="3clFb_" id="8odmgCo4Lh" role="jymVt">
+                        <property role="1EzhhJ" value="false" />
+                        <property role="TrG5h" value="handleFailure" />
+                        <property role="DiZV1" value="false" />
+                        <property role="od$2w" value="false" />
+                        <node concept="3Tm1VV" id="8odmgCo4Li" role="1B3o_S" />
+                        <node concept="3uibUv" id="8odmgCo4Lk" role="3clF45">
+                          <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+                        </node>
+                        <node concept="37vLTG" id="8odmgCo4Ll" role="3clF46">
+                          <property role="TrG5h" value="failure" />
+                          <node concept="3uibUv" id="8odmgCo4Lm" role="1tU5fm">
+                            <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+                          </node>
+                        </node>
+                        <node concept="37vLTG" id="8odmgCo4Ln" role="3clF46">
+                          <property role="TrG5h" value="rule" />
+                          <node concept="3uibUv" id="8odmgCo4Lo" role="1tU5fm">
+                            <ref role="3uigEE" to="av0y:~Rule" resolve="Rule" />
+                          </node>
+                        </node>
+                        <node concept="3clFbS" id="8odmgCo4Lp" role="3clF47">
+                          <node concept="3clFbH" id="8odmgCoHiQ" role="3cqZAp" />
+                          <node concept="3clFbJ" id="8odmgCoHk0" role="3cqZAp">
+                            <node concept="3clFbS" id="8odmgCoHk2" role="3clFbx">
+                              <node concept="3clFbF" id="8odmgCoHuJ" role="3cqZAp">
+                                <node concept="2OqwBi" id="8odmgCoHQh" role="3clFbG">
+                                  <node concept="2YIFZM" id="8odmgCoHx_" role="2Oq$k0">
+                                    <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
+                                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
+                                    <node concept="2OqwBi" id="8odmgCoHDZ" role="37wK5m">
+                                      <node concept="2YIFZM" id="8odmgCoH$4" role="2Oq$k0">
+                                        <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
+                                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                                      </node>
+                                      <node concept="liA8E" id="8odmgCoHKm" role="2OqNvi">
+                                        <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="8odmgCoHXm" role="2OqNvi">
+                                    <ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
+                                    <node concept="Rm8GO" id="8odmgCoL3K" role="37wK5m">
+                                      <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                                      <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                                    </node>
+                                    <node concept="2OqwBi" id="8odmgCp7$l" role="37wK5m">
+                                      <node concept="1eOMI4" id="8odmgCp7$m" role="2Oq$k0">
+                                        <node concept="10QFUN" id="8odmgCp7$n" role="1eOMHV">
+                                          <node concept="3uibUv" id="8odmgCp7$o" role="10QFUM">
+                                            <ref role="3uigEE" to="6pyv:7nPD14OaO1O" resolve="RuleEx" />
+                                          </node>
+                                          <node concept="37vLTw" id="8odmgCp7$p" role="10QFUP">
+                                            <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="8odmgCp7$q" role="2OqNvi">
+                                        <ref role="37wK5l" to="6pyv:7nPD14Ob4em" resolve="originRef" />
+                                      </node>
+                                    </node>
+                                    <node concept="2OqwBi" id="8odmgCoMt9" role="37wK5m">
+                                      <node concept="37vLTw" id="8odmgCoMjU" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="8odmgCo4Ll" resolve="failure" />
+                                      </node>
+                                      <node concept="liA8E" id="8odmgCoMDE" role="2OqNvi">
+                                        <ref role="37wK5l" to="w7la:~EvaluationFailure.getMessage():java.lang.String" resolve="getMessage" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWs6" id="8odmgCoMG0" role="3cqZAp">
+                                <node concept="10Nm6u" id="8odmgCoMHh" role="3cqZAk" />
+                              </node>
+                            </node>
+                            <node concept="1Wc70l" id="8odmgCp724" role="3clFbw">
+                              <node concept="2ZW3vV" id="8odmgCoLj4" role="3uHU7B">
+                                <node concept="3uibUv" id="8odmgCoLjk" role="2ZW6by">
+                                  <ref role="3uigEE" to="6pyv:7nPD14OaO1O" resolve="RuleEx" />
+                                </node>
+                                <node concept="37vLTw" id="8odmgCoL5g" role="2ZW6bz">
+                                  <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                </node>
+                              </node>
+                              <node concept="3y3z36" id="8odmgCp7zc" role="3uHU7w">
+                                <node concept="10Nm6u" id="8odmgCp7$i" role="3uHU7w" />
+                                <node concept="2OqwBi" id="8odmgCp72f" role="3uHU7B">
+                                  <node concept="1eOMI4" id="8odmgCp72g" role="2Oq$k0">
+                                    <node concept="10QFUN" id="8odmgCp72h" role="1eOMHV">
+                                      <node concept="3uibUv" id="8odmgCp72i" role="10QFUM">
+                                        <ref role="3uigEE" to="6pyv:7nPD14OaO1O" resolve="RuleEx" />
+                                      </node>
+                                      <node concept="37vLTw" id="8odmgCp72j" role="10QFUP">
+                                        <ref role="3cqZAo" node="8odmgCo4Ln" resolve="rule" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="liA8E" id="8odmgCp72k" role="2OqNvi">
+                                    <ref role="37wK5l" to="6pyv:7nPD14Ob4em" resolve="originRef" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbH" id="8odmgCoMHM" role="3cqZAp" />
+                          <node concept="3cpWs6" id="8odmgCoMJg" role="3cqZAp">
+                            <node concept="37vLTw" id="8odmgCoMKE" role="3cqZAk">
+                              <ref role="3cqZAo" node="8odmgCo4Ll" resolve="failure" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="8odmgCo0jJ" role="37vLTJ">
+              <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="8odmgCo4LW" role="3cqZAp" />
         <node concept="1DcWWT" id="7lt0LtQu0jy" role="3cqZAp">
           <node concept="3clFbS" id="7lt0LtQu0j_" role="2LFqv$">
             <node concept="3clFbF" id="7lt0LtQtR7U" role="3cqZAp">
@@ -1057,9 +1200,9 @@
         </node>
         <node concept="3cpWs8" id="5mr7UHcbsDR" role="3cqZAp">
           <node concept="3cpWsn" id="5mr7UHcbsDS" role="3cpWs9">
-            <property role="TrG5h" value="evaluationSession" />
-            <node concept="3uibUv" id="5mr7UHcbsDe" role="1tU5fm">
-              <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+            <property role="TrG5h" value="evaluationResult" />
+            <node concept="3uibUv" id="1X0h_efXwhM" role="1tU5fm">
+              <ref role="3uigEE" to="w7la:~EvaluationResult" resolve="EvaluationResult" />
             </node>
             <node concept="10Nm6u" id="7rf49NgqS96" role="33vP2m" />
           </node>
@@ -1146,17 +1289,54 @@
                     <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                   </node>
                   <node concept="liA8E" id="5mr7UHcbsE5" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
+                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationResult" resolve="start" />
                     <node concept="37vLTw" id="2UGjFq4Lf8i" role="37wK5m">
                       <ref role="3cqZAo" node="2UGjFq4Lesf" resolve="sessionSolver" />
                     </node>
                   </node>
                 </node>
                 <node concept="37vLTw" id="1Ry9kf2vmS7" role="37vLTJ">
-                  <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationSession" />
+                  <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationResult" />
                 </node>
               </node>
             </node>
+            <node concept="3cpWs8" id="1X0h_efYbPh" role="3cqZAp">
+              <node concept="3cpWsn" id="1X0h_efYbPi" role="3cpWs9">
+                <property role="TrG5h" value="failure" />
+                <node concept="2OqwBi" id="1X0h_efYbPj" role="33vP2m">
+                  <node concept="37vLTw" id="1X0h_efYbPk" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationResult" />
+                  </node>
+                  <node concept="liA8E" id="1X0h_efYbPl" role="2OqNvi">
+                    <ref role="37wK5l" to="w7la:~EvaluationResult.failure():jetbrains.mps.logic.reactor.evaluation.EvaluationFailure" resolve="failure" />
+                  </node>
+                </node>
+                <node concept="3uibUv" id="8odmgCcssF" role="1tU5fm">
+                  <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="1X0h_efY7po" role="3cqZAp">
+              <node concept="3clFbS" id="1X0h_efY7pq" role="3clFbx">
+                <node concept="YS8fn" id="1X0h_efYaF8" role="3cqZAp">
+                  <node concept="2OqwBi" id="1X0h_efYvb5" role="YScLw">
+                    <node concept="37vLTw" id="1X0h_efYbPn" role="2Oq$k0">
+                      <ref role="3cqZAo" node="1X0h_efYbPi" resolve="failure" />
+                    </node>
+                    <node concept="liA8E" id="1X0h_efYvi3" role="2OqNvi">
+                      <ref role="37wK5l" to="w7la:~EvaluationFailure.getCause():jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException" resolve="getCause" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="8odmgCcsAb" role="3clFbw">
+                <node concept="10Nm6u" id="8odmgCcsAF" role="3uHU7w" />
+                <node concept="37vLTw" id="1X0h_efYbPm" role="3uHU7B">
+                  <ref role="3cqZAo" node="1X0h_efYbPi" resolve="failure" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="1X0h_efYdfs" role="3cqZAp" />
             <node concept="3clFbF" id="3GlpCDSF16f" role="3cqZAp">
               <node concept="37vLTI" id="3GlpCDSF3sl" role="3clFbG">
                 <node concept="2OqwBi" id="3GlpCDSF22I" role="37vLTJ">
@@ -1167,15 +1347,15 @@
                 </node>
                 <node concept="2OqwBi" id="5jCHAT1QTrY" role="37vLTx">
                   <node concept="37vLTw" id="3GlpCDSF4lt" role="2Oq$k0">
-                    <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationSession" />
+                    <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationResult" />
                   </node>
                   <node concept="liA8E" id="5jCHAT1QTDv" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationSession.storeView():jetbrains.mps.logic.reactor.evaluation.StoreView" resolve="storeView" />
+                    <ref role="37wK5l" to="w7la:~EvaluationResult.storeView():jetbrains.mps.logic.reactor.evaluation.StoreView" resolve="storeView" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="1Ry9kf2vjSe" role="3cqZAp" />
+            <node concept="3clFbH" id="1X0h_efY7oC" role="3cqZAp" />
           </node>
           <node concept="3clFbS" id="1Ry9kf2vh7I" role="2GVbov">
             <node concept="3SKdUt" id="4F3SXIF5S$a" role="3cqZAp">
@@ -1335,10 +1515,10 @@
             </node>
             <node concept="2OqwBi" id="5jCHAT1QROG" role="33vP2m">
               <node concept="37vLTw" id="5jCHAT1QROH" role="2Oq$k0">
-                <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationSession" />
+                <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationResult" />
               </node>
               <node concept="liA8E" id="5jCHAT1QROI" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession.storeView():jetbrains.mps.logic.reactor.evaluation.StoreView" resolve="storeView" />
+                <ref role="37wK5l" to="w7la:~EvaluationResult.storeView():jetbrains.mps.logic.reactor.evaluation.StoreView" resolve="storeView" />
               </node>
             </node>
           </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
index 8e1c5247..ca7ec9db 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.program.mps
@@ -2163,17 +2163,21 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
-      <node concept="3clFb_" id="7feMCq_cIyn" role="jymVt">
+      <node concept="3clFb_" id="8odmgCdh$k" role="jymVt">
         <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="reportFailure" />
-        <node concept="37vLTG" id="7feMCq_cIyo" role="3clF46">
-          <property role="TrG5h" value="message" />
-          <node concept="17QB3L" id="7feMCq_cIyp" role="1tU5fm" />
+        <property role="TrG5h" value="failure" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tm1VV" id="8odmgCdh$l" role="1B3o_S" />
+        <node concept="3cqZAl" id="8odmgCdh$n" role="3clF45" />
+        <node concept="37vLTG" id="8odmgCdh$o" role="3clF46">
+          <property role="TrG5h" value="failure" />
+          <node concept="3uibUv" id="8odmgCdh$p" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+          </node>
         </node>
-        <node concept="3cqZAl" id="7feMCq_cIyq" role="3clF45" />
-        <node concept="3Tm1VV" id="7feMCq_cIyr" role="1B3o_S" />
-        <node concept="3clFbS" id="7feMCq_cIyv" role="3clF47" />
-        <node concept="2AHcQZ" id="15BaR5AeWc4" role="2AJF6D">
+        <node concept="3clFbS" id="8odmgCdh$r" role="3clF47" />
+        <node concept="2AHcQZ" id="8odmgCdh$s" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 5162dd15..453c3d5a 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -6025,17 +6025,21 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7vxJ_H4trvc" role="jymVt" />
-    <node concept="3clFb_" id="YGS68MEg4B" role="jymVt">
+    <node concept="3clFb_" id="8odmgCdhBu" role="jymVt">
       <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="reportFailure" />
-      <node concept="37vLTG" id="YGS68MEg4C" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="YGS68MEg4D" role="1tU5fm" />
+      <property role="TrG5h" value="failure" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="8odmgCdhBv" role="1B3o_S" />
+      <node concept="3cqZAl" id="8odmgCdhBx" role="3clF45" />
+      <node concept="37vLTG" id="8odmgCdhBy" role="3clF46">
+        <property role="TrG5h" value="failure" />
+        <node concept="3uibUv" id="8odmgCdhBz" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+        </node>
       </node>
-      <node concept="3cqZAl" id="YGS68MEg4E" role="3clF45" />
-      <node concept="3Tm1VV" id="YGS68MEg4F" role="1B3o_S" />
-      <node concept="3clFbS" id="YGS68MEg4G" role="3clF47" />
-      <node concept="2AHcQZ" id="YGS68MEg4H" role="2AJF6D">
+      <node concept="3clFbS" id="8odmgCdhB_" role="3clF47" />
+      <node concept="2AHcQZ" id="8odmgCdhBA" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
@@ -27919,6 +27923,103 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7vxJ_H4twbw" role="jymVt" />
+    <node concept="3clFb_" id="8odmgCdik5" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="failure" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="8odmgCdik6" role="1B3o_S" />
+      <node concept="3cqZAl" id="8odmgCdik7" role="3clF45" />
+      <node concept="37vLTG" id="8odmgCdik8" role="3clF46">
+        <property role="TrG5h" value="failure" />
+        <node concept="3uibUv" id="8odmgCdik9" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="8odmgCdikb" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="3clFbS" id="8odmgCdikc" role="3clF47">
+        <node concept="3clFbJ" id="8odmgCmxf1" role="3cqZAp">
+          <node concept="3clFbS" id="8odmgCmxf3" role="3clFbx">
+            <node concept="3clFbF" id="8odmgCmD0E" role="3cqZAp">
+              <node concept="37vLTI" id="8odmgCmFOB" role="3clFbG">
+                <node concept="37vLTw" id="8odmgCmGm6" role="37vLTx">
+                  <ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
+                </node>
+                <node concept="3EllGN" id="8odmgCmFa4" role="37vLTJ">
+                  <node concept="37vLTw" id="8odmgCmFFm" role="3ElVtu">
+                    <ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
+                  </node>
+                  <node concept="37vLTw" id="8odmgCmD0C" role="3ElQJh">
+                    <ref role="3cqZAo" node="8odmgCm2gs" resolve="seenFailures" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="8odmgCdi_U" role="3cqZAp">
+              <node concept="1rXfSq" id="8odmgCdi_V" role="3clFbG">
+                <ref role="37wK5l" node="YGS68MDG_7" resolve="recordActivationEvent" />
+                <node concept="Rm8GO" id="8odmgCdi_W" role="37wK5m">
+                  <ref role="Rm8GQ" node="7vxJ_H4mnTR" resolve="FAILURE" />
+                  <ref role="1Px2BO" node="5X6ji59xezw" resolve="ActivationEvent" />
+                </node>
+                <node concept="1bVj0M" id="8odmgCdi_X" role="37wK5m">
+                  <node concept="37vLTG" id="8odmgCdi_Y" role="1bW2Oz">
+                    <property role="TrG5h" value="id" />
+                    <node concept="10Oyi0" id="8odmgCdi_Z" role="1tU5fm" />
+                  </node>
+                  <node concept="3clFbS" id="8odmgCdiA0" role="1bW5cS">
+                    <node concept="3clFbF" id="8odmgCdiA1" role="3cqZAp">
+                      <node concept="2OqwBi" id="8odmgCdiA2" role="3clFbG">
+                        <node concept="37vLTw" id="8odmgCdiA3" role="2Oq$k0">
+                          <ref role="3cqZAo" node="YGS68MDFfZ" resolve="activationModelBuilder" />
+                        </node>
+                        <node concept="liA8E" id="8odmgCdiA4" role="2OqNvi">
+                          <ref role="37wK5l" node="7vxJ_H4mqbm" resolve="failure" />
+                          <node concept="37vLTw" id="8odmgCdiA5" role="37wK5m">
+                            <ref role="3cqZAo" node="8odmgCdi_Y" resolve="id" />
+                          </node>
+                          <node concept="2OqwBi" id="8odmgCdiA6" role="37wK5m">
+                            <node concept="37vLTw" id="8odmgCdCxt" role="2Oq$k0">
+                              <ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
+                            </node>
+                            <node concept="liA8E" id="8odmgCdiA8" role="2OqNvi">
+                              <ref role="37wK5l" to="w7la:~EvaluationFailure.getMessage():java.lang.String" resolve="getMessage" />
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="8odmgCdDm4" role="37wK5m">
+                            <node concept="37vLTw" id="8odmgCdCUB" role="2Oq$k0">
+                              <ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
+                            </node>
+                            <node concept="liA8E" id="8odmgCdDFQ" role="2OqNvi">
+                              <ref role="37wK5l" to="w7la:~EvaluationFailure.getCause():jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException" resolve="getCause" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3fqX7Q" id="8odmgCmCii" role="3clFbw">
+            <node concept="2OqwBi" id="8odmgCmCik" role="3fr31v">
+              <node concept="37vLTw" id="8odmgCmCil" role="2Oq$k0">
+                <ref role="3cqZAo" node="8odmgCm2gs" resolve="seenFailures" />
+              </node>
+              <node concept="2Nt0df" id="8odmgCmCim" role="2OqNvi">
+                <node concept="37vLTw" id="8odmgCmCin" role="38cxEo">
+                  <ref role="3cqZAo" node="8odmgCdik8" resolve="failure" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="8odmgCdDFT" role="jymVt" />
     <node concept="3clFb_" id="YGS68MESJW" role="jymVt">
       <property role="TrG5h" value="refresh" />
       <node concept="3cqZAl" id="YGS68MESJX" role="3clF45" />
@@ -29305,6 +29406,30 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3wxtToDWkFy" role="jymVt" />
+    <node concept="312cEg" id="8odmgCm2gs" role="jymVt">
+      <property role="TrG5h" value="seenFailures" />
+      <node concept="3Tm6S6" id="8odmgCm2gt" role="1B3o_S" />
+      <node concept="2ShNRf" id="8odmgCm3Jw" role="33vP2m">
+        <node concept="1pGfFk" id="8odmgCmvu2" role="2ShVmc">
+          <ref role="37wK5l" to="33ny:~IdentityHashMap.&lt;init&gt;()" resolve="IdentityHashMap" />
+          <node concept="3uibUv" id="8odmgCnuy$" role="1pMfVU">
+            <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+          </node>
+          <node concept="3uibUv" id="8odmgCn4Rw" role="1pMfVU">
+            <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+          </node>
+        </node>
+      </node>
+      <node concept="3rvAFt" id="8odmgCmv_S" role="1tU5fm">
+        <node concept="3uibUv" id="8odmgCnuqK" role="3rvQeY">
+          <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+        </node>
+        <node concept="3uibUv" id="8odmgCn4BR" role="3rvSg0">
+          <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="8odmgCm1QL" role="jymVt" />
     <node concept="312cEg" id="YGS68MDFfZ" role="jymVt">
       <property role="TrG5h" value="activationModelBuilder" />
       <node concept="3Tm6S6" id="YGS68MDFg0" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 8c5b3be3..f5702718 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -3268,58 +3268,62 @@
         </node>
       </node>
     </node>
-    <node concept="3clFb_" id="7nPD14NbLw9" role="jymVt">
+    <node concept="3clFb_" id="8odmgCdE5K" role="jymVt">
       <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="reportFailure" />
-      <node concept="37vLTG" id="7nPD14NbLwa" role="3clF46">
-        <property role="TrG5h" value="message" />
-        <node concept="17QB3L" id="7nPD14NbLwb" role="1tU5fm" />
+      <property role="TrG5h" value="failure" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="8odmgCdE5L" role="1B3o_S" />
+      <node concept="3cqZAl" id="8odmgCdE5N" role="3clF45" />
+      <node concept="37vLTG" id="8odmgCdE5O" role="3clF46">
+        <property role="TrG5h" value="failure" />
+        <node concept="3uibUv" id="8odmgCdE5P" role="1tU5fm">
+          <ref role="3uigEE" to="w7la:~EvaluationFailure" resolve="EvaluationFailure" />
+        </node>
       </node>
-      <node concept="3cqZAl" id="7nPD14NbLwc" role="3clF45" />
-      <node concept="3Tm1VV" id="7nPD14NbLwd" role="1B3o_S" />
-      <node concept="3clFbS" id="7nPD14NbLwg" role="3clF47">
-        <node concept="1Dw8fO" id="5mg4ZgLdqkO" role="3cqZAp">
-          <node concept="3clFbS" id="5mg4ZgLdqkP" role="2LFqv$">
-            <node concept="3clFbF" id="5mg4ZgLdqkQ" role="3cqZAp">
-              <node concept="2OqwBi" id="5mg4ZgLdqkR" role="3clFbG">
-                <node concept="AH0OO" id="5mg4ZgLdqkS" role="2Oq$k0">
-                  <node concept="37vLTw" id="5mg4ZgLdqkT" role="AHEQo">
-                    <ref role="3cqZAo" node="5mg4ZgLdqkX" resolve="i" />
+      <node concept="3clFbS" id="8odmgCdE5R" role="3clF47">
+        <node concept="1Dw8fO" id="8odmgCdEcC" role="3cqZAp">
+          <node concept="3clFbS" id="8odmgCdEcD" role="2LFqv$">
+            <node concept="3clFbF" id="8odmgCdEcE" role="3cqZAp">
+              <node concept="2OqwBi" id="8odmgCdEcF" role="3clFbG">
+                <node concept="AH0OO" id="8odmgCdEcG" role="2Oq$k0">
+                  <node concept="37vLTw" id="8odmgCdEcH" role="AHEQo">
+                    <ref role="3cqZAo" node="8odmgCdEcL" resolve="i" />
                   </node>
-                  <node concept="37vLTw" id="5mg4ZgLdqkU" role="AHHXb">
+                  <node concept="37vLTw" id="8odmgCdEcI" role="AHHXb">
                     <ref role="3cqZAo" node="7nPD14NbJdt" resolve="traces" />
                   </node>
                 </node>
-                <node concept="liA8E" id="5mg4ZgLdqkV" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.reportFailure(java.lang.String):void" resolve="reportFailure" />
-                  <node concept="37vLTw" id="5mg4ZgLdtKJ" role="37wK5m">
-                    <ref role="3cqZAo" node="7nPD14NbLwa" resolve="message" />
+                <node concept="liA8E" id="8odmgCdEcJ" role="2OqNvi">
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.failure(jetbrains.mps.logic.reactor.evaluation.EvaluationFailure):void" resolve="failure" />
+                  <node concept="37vLTw" id="8odmgCdFs5" role="37wK5m">
+                    <ref role="3cqZAo" node="8odmgCdE5O" resolve="failure" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWsn" id="5mg4ZgLdqkX" role="1Duv9x">
+          <node concept="3cpWsn" id="8odmgCdEcL" role="1Duv9x">
             <property role="TrG5h" value="i" />
-            <node concept="10Oyi0" id="5mg4ZgLdqkY" role="1tU5fm" />
-            <node concept="3cmrfG" id="5mg4ZgLdqkZ" role="33vP2m">
+            <node concept="10Oyi0" id="8odmgCdEcM" role="1tU5fm" />
+            <node concept="3cmrfG" id="8odmgCdEcN" role="33vP2m">
               <property role="3cmrfH" value="0" />
             </node>
           </node>
-          <node concept="3eOVzh" id="5mg4ZgLdql0" role="1Dwp0S">
-            <node concept="2OqwBi" id="5mg4ZgLdql1" role="3uHU7w">
-              <node concept="37vLTw" id="5mg4ZgLdql2" role="2Oq$k0">
+          <node concept="3eOVzh" id="8odmgCdEcO" role="1Dwp0S">
+            <node concept="2OqwBi" id="8odmgCdEcP" role="3uHU7w">
+              <node concept="37vLTw" id="8odmgCdEcQ" role="2Oq$k0">
                 <ref role="3cqZAo" node="7nPD14NbJdt" resolve="traces" />
               </node>
-              <node concept="1Rwk04" id="5mg4ZgLdql3" role="2OqNvi" />
+              <node concept="1Rwk04" id="8odmgCdEcR" role="2OqNvi" />
             </node>
-            <node concept="37vLTw" id="5mg4ZgLdql4" role="3uHU7B">
-              <ref role="3cqZAo" node="5mg4ZgLdqkX" resolve="i" />
+            <node concept="37vLTw" id="8odmgCdEcS" role="3uHU7B">
+              <ref role="3cqZAo" node="8odmgCdEcL" resolve="i" />
             </node>
           </node>
-          <node concept="3uNrnE" id="5mg4ZgLdql5" role="1Dwrff">
-            <node concept="37vLTw" id="5mg4ZgLdql6" role="2$L3a6">
-              <ref role="3cqZAo" node="5mg4ZgLdqkX" resolve="i" />
+          <node concept="3uNrnE" id="8odmgCdEcT" role="1Dwrff">
+            <node concept="37vLTw" id="8odmgCdEcU" role="2$L3a6">
+              <ref role="3cqZAo" node="8odmgCdEcL" resolve="i" />
             </node>
           </node>
         </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.reactor/gradle.properties b/coderules/solutions/jetbrains.mps.logic.reactor/gradle.properties
index 0488b00e..24739ad2 100644
--- a/coderules/solutions/jetbrains.mps.logic.reactor/gradle.properties
+++ b/coderules/solutions/jetbrains.mps.logic.reactor/gradle.properties
@@ -1,4 +1,4 @@
 kotlinVersion = 1.2.30
 trove4jVersion = 3.0.3
 dexxVersion = 0.7
-conreactorVersion = 0.9.1
+conreactorVersion = 0.9.2
diff --git a/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd b/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
index a4da7fb2..060f76a6 100644
--- a/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
+++ b/coderules/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd
@@ -3,8 +3,8 @@
   <models>
     <modelRoot contentPath="${module}" type="java_classes">
       <sourceRoot location="lib/collection-0.7.jar" />
-      <sourceRoot location="lib/conreactor-api-0.9.1.jar" />
-      <sourceRoot location="lib/conreactor-core-0.9.1.jar" />
+      <sourceRoot location="lib/conreactor-api-0.9.2.jar" />
+      <sourceRoot location="lib/conreactor-core-0.9.2.jar" />
     </modelRoot>
   </models>
   <stubModelEntries>
@@ -12,8 +12,8 @@
     <stubModelEntry path="${module}/lib/trove4j-3.0.3.jar" />
     <stubModelEntry path="${module}/lib/kotlin-runtime-1.2.30.jar" />
     <stubModelEntry path="${module}/lib/kotlin-stdlib-1.2.30.jar" />
-    <stubModelEntry path="${module}/lib/conreactor-api-0.9.1.jar" />
-    <stubModelEntry path="${module}/lib/conreactor-core-0.9.1.jar" />
+    <stubModelEntry path="${module}/lib/conreactor-api-0.9.2.jar" />
+    <stubModelEntry path="${module}/lib/conreactor-core-0.9.2.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 0bc27c40..99f164b9 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -530,8 +530,26 @@
             <node concept="10Nm6u" id="6Qzc0KyFxsL" role="3clFbG" />
           </node>
         </node>
-        <node concept="2AHcQZ" id="6Qzc0KyFxsK" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="3clFb_" id="694E_55g1vK" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="withFailureHandler" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tm1VV" id="694E_55g1vL" role="1B3o_S" />
+        <node concept="3uibUv" id="694E_55g1vN" role="3clF45">
+          <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
+        </node>
+        <node concept="37vLTG" id="694E_55g1vO" role="3clF46">
+          <property role="TrG5h" value="handler" />
+          <node concept="3uibUv" id="694E_55g1vP" role="1tU5fm">
+            <ref role="3uigEE" to="w7la:~FailureHandler" resolve="FailureHandler" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="694E_55g1vQ" role="3clF47">
+          <node concept="3clFbF" id="694E_55g1vT" role="3cqZAp">
+            <node concept="10Nm6u" id="694E_55g1vS" role="3clFbG" />
+          </node>
         </node>
       </node>
       <node concept="3clFb_" id="2UGjFq4L4SC" role="jymVt">
@@ -543,8 +561,8 @@
             <ref role="3uigEE" to="w7la:~SessionSolver" resolve="SessionSolver" />
           </node>
         </node>
-        <node concept="3uibUv" id="2UGjFq4L4SF" role="3clF45">
-          <ref role="3uigEE" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+        <node concept="3uibUv" id="da2PmlMQg_" role="3clF45">
+          <ref role="3uigEE" to="w7la:~EvaluationResult" resolve="EvaluationResult" />
         </node>
         <node concept="3Tm1VV" id="2UGjFq4L4SG" role="1B3o_S" />
         <node concept="3clFbS" id="2UGjFq4L4SI" role="3clF47">
@@ -592,6 +610,9 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="da2PmlMQil" role="3cqZAp">
+            <node concept="10Nm6u" id="da2PmlMQij" role="3clFbG" />
+          </node>
         </node>
       </node>
       <node concept="312cEg" id="5jPBdK_qdB" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index 4e9c36de..a3811f10 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -5110,7 +5110,7 @@
               </node>
             </node>
             <node concept="liA8E" id="5jPBdK_v1h" role="2OqNvi">
-              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationResult" resolve="start" />
               <node concept="10Nm6u" id="2UGjFq4LcSH" role="37wK5m" />
             </node>
           </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index 1c644371..e107f048 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -4972,7 +4972,7 @@
               </node>
             </node>
             <node concept="liA8E" id="5jPBdK_v1h" role="2OqNvi">
-              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationResult" resolve="start" />
               <node concept="10Nm6u" id="2UGjFq4L8wv" role="37wK5m" />
             </node>
           </node>
@@ -5444,7 +5444,7 @@
               </node>
             </node>
             <node concept="liA8E" id="5jPBdK_QKs" role="2OqNvi">
-              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="start" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession$Config.start(jetbrains.mps.logic.reactor.evaluation.SessionSolver):jetbrains.mps.logic.reactor.evaluation.EvaluationResult" resolve="start" />
               <node concept="10Nm6u" id="2UGjFq4L8GP" role="37wK5m" />
             </node>
           </node>