Done adding Catch with return of Promise

Tests/PromiseTests.cs

@@ -202,7 +202,10 @@ public void error_handler_is_not_invoked_for_resolved_promised()
         {
             var promise = new Promise<int>();
 
-            promise.Catch(e => throw new Exception("This shouldn't happen"));
+            promise.Catch(e => {
+                throw new Exception("This shouldn't happen");
+                return -1;
+            });
 
             promise.Resolve(5);
         }
@@ -759,7 +762,6 @@ public void can_chain_promise_and_convert_type_of_value()
                 .Then(v =>
                 {
                     Assert.Equal(chainedPromiseValue, v);
-
                     ++completed;
                 });
 
@@ -1424,5 +1426,35 @@ public void rejected_reject_callback_is_caught_by_chained_catch()
 
             Assert.Equal(expectedException, actualException);
         }
+
+        [Fact]
+        public void resolved_callback_is_caught_by_catch_returning_promise() {
+            var promise = new Promise<int>();
+            int excepectedValue = 1;
+            int actualValue = 0;
+
+            promise.Catch(err => Promise<int>.Resolved(-1))
+                   .Then(result => { actualValue = result; })
+                   .Catch(err => throw new Exception("Should not happend."));
+
+            promise.Resolve(1);
+
+            Assert.Equal(excepectedValue, actualValue);
+        }
+
+        [Fact]
+        public void rejected_callback_is_caught_by_catch_returning_promise() {
+            var promise         = new Promise<int>();
+            int excepectedValue = -1;
+            int actualValue = 0;
+
+            promise.Catch(err => Promise<int>.Rejected(new Exception()))
+                   .Then(result => throw new Exception("Should not happend."))
+                   .Catch(err => actualValue = -1);
+
+            promise.Resolve(1);
+
+            Assert.Equal(excepectedValue, actualValue);
+        }
     }
 }

src/Promise.cs

@@ -51,6 +51,11 @@ public interface IPromise<PromisedT>
         /// </summary>
         IPromise<PromisedT> Catch(Func<Exception, PromisedT> onRejected);
 
+        /// <summary>
+        /// Handle errors for the promise.
+        /// </summary>
+        IPromise<PromisedT> Catch(Func<Exception, IPromise<PromisedT>> onRejected);
+
         /// <summary>
         /// Add a resolved callback that chains a value promise (optionally converting to a different value type).
         /// </summary>
@@ -580,6 +585,35 @@ public IPromise<PromisedT> Catch(Func<Exception, PromisedT> onRejected)
 
             return resultPromise;
         }
+
+        /// <summary>
+        /// Handle errors for the promise.
+        /// </summary>
+        public IPromise<PromisedT> Catch(Func<Exception, IPromise<PromisedT>> onRejected) {
+            var resultPromise = new Promise<PromisedT>();
+            resultPromise.WithName(Name);
+
+            Action<PromisedT> resolveHandler = v => resultPromise.Resolve(v);
+
+            Action<Exception> rejectHandler = ex =>
+            {
+                try {
+                    onRejected(ex)
+                        .Progress(progress => resultPromise.ReportProgress(progress))
+                        .Then(resolve => resultPromise.Resolve(resolve))
+                        .Catch(reject => resultPromise.Reject(ex));
+                }
+                catch (Exception cbEx)
+                {
+                    resultPromise.Reject(cbEx);
+                }
+            };
+
+            ActionHandlers(resultPromise, resolveHandler, rejectHandler);
+            ProgressHandlers(resultPromise, v => resultPromise.ReportProgress(v));
+
+            return resultPromise;
+        }
 
         /// <summary>
         /// Add a resolved callback that chains a value promise (optionally converting to a different value type).

src/Promise_NonGeneric.cs

@@ -646,8 +646,6 @@ public IPromise WithName(string name)
         /// </summary>
         public IPromise Catch(Action<Exception> onRejected)
         {
-//            Argument.NotNull(() => onRejected);
-
             var resultPromise = new Promise();
             resultPromise.WithName(Name);