InsertWithExpand.diff

 Simple.OData.Client.Core/ODataClient.Internals.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Simple.OData.Client.Core/ODataClient.Internals.cs b/Simple.OData.Client.Core/ODataClient.Internals.cs
index c79e0ac..53431d4 100644
--- a/Simple.OData.Client.Core/ODataClient.Internals.cs
+++ b/Simple.OData.Client.Core/ODataClient.Internals.cs
@@ -23,13 +23,16 @@ namespace Simple.OData.Client
 
             var result = await ExecuteRequestWithResultAsync(request, cancellationToken,
                 x => x.AsEntry(_session.Settings.IncludeAnnotationsInResults), () => null, () => request.EntryData).ConfigureAwait(false);
-            if (cancellationToken.IsCancellationRequested) cancellationToken.ThrowIfCancellationRequested();
+            if (cancellationToken.IsCancellationRequested) cancellationToken.ThrowIfCancellationRequested();
 
-            var keyNames = _session.Metadata.GetDeclaredKeyPropertyNames(commandText);
-            if (result == null && resultRequired && Utils.AllMatch(keyNames, entryData.Keys, _session.Pluralizer))
-            {
-                result = await this.GetEntryAsync(commandText, entryData, cancellationToken).ConfigureAwait(false);
-                if (cancellationToken.IsCancellationRequested) cancellationToken.ThrowIfCancellationRequested();
+            if (result == null && resultRequired)
+            {
+                var keyNames = _session.Metadata.GetDeclaredKeyPropertyNames(commandText);
+                if (Utils.AllMatch(keyNames, entryData.Keys, _session.Pluralizer))
+                {
+                    result = await this.GetEntryAsync(commandText, entryData, cancellationToken).ConfigureAwait(false);
+                    if (cancellationToken.IsCancellationRequested) cancellationToken.ThrowIfCancellationRequested();
+                }
             }
 
             return result;