OPENICF-604: NPE issue

WrenSecurity · Oct 4, 2016 · 9a69b35 · 9a69b35
1 parent cc92a07
commit 9a69b35
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/FrameworkRPC/Rpc.cs b/FrameworkRPC/Rpc.cs
@@ -611,7 +611,7 @@ public virtual TR TrySubmitRequest<TR, TV, TE>(IRemoteRequestFactory<TR, TV, TE,
                 }
                 else if (remoteRequest.Promise == null)
                 {
-                    Trace.TraceError("FATAL: Concurrency Problem! Prmoise can not be null if result is not null.");
+                    Trace.TraceError("Concurrency Problem! Promise can not be null if result is not null.");
                 }
             }
             return remoteRequest;
@@ -824,7 +824,7 @@ public virtual Int64 RequestId
 
         public virtual Task<TV> Promise
         {
-            get { return _promise.Task; }
+            get { return _promise != null ? _promise.Task : default(Task<TV>); }
         }
 
         /// <summary>