--- a/Implab/Safe.cs	Sat Feb 07 19:41:31 2015 +0300
+++ b/Implab/Safe.cs	Mon Feb 09 00:28:13 2015 +0300
@@ -89,15 +89,19 @@
         public static IPromise InvokePromise(Func<IPromise> action) {
             ArgumentNotNull(action, "action");
 
-            var p = new Promise();
             try {
-                action();
-                p.Resolve();
+                var p = action();
+                if (p == null) {
+                    var d = new Promise();
+                    d.Reject(new Exception("The action returned null"));
+                    p = d;
+                }
+                return p;
             } catch (Exception err) {
+                var p = new Promise();
                 p.Reject(err);
+                return p;
             }
-
-            return p;
         }
 
         [DebuggerStepThrough]