--- a/Implab/Components/RunnableComponent.cs	Mon Apr 18 16:41:17 2016 +0300
+++ b/Implab/Components/RunnableComponent.cs	Tue Apr 19 00:50:14 2016 +0300
@@ -139,14 +139,7 @@
                         throw new PromiseTransientException(e);
                     },
                     r => {
-                        lock(m_stateMachine) {
-                            if (m_pending == promise) {
-                                Move(Commands.Fail);
-                                m_pending = null;
-                                m_lastError = new OperationCanceledException("The operation has been cancelled", r);
-                            }
-
-                        }
+                        // handle cancellation as exception
                         throw new OperationCanceledException("The operation has been cancelled", r);
                     }
                 );
@@ -201,7 +194,7 @@
             if (current == null) {
                 stop.Resolve();
             } else {
-                current.On(stop.Resolve, stop.Reject, stop.CancelOperation);
+                current.On(stop.Resolve, stop.Reject, e => stop.Resolve());
                 current.Cancel();
             }
         }