diff --git a/Templates/CSharp/Base/EntityRequest.Base.template.tt b/Templates/CSharp/Base/EntityRequest.Base.template.tt
index f9de59105..21048dda9 100644
--- a/Templates/CSharp/Base/EntityRequest.Base.template.tt
+++ b/Templates/CSharp/Base/EntityRequest.Base.template.tt
@@ -350,8 +350,8 @@ public void AppendUpdateAsyncHeader(string entityName, string lowerCaseEntityNam
     {
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("        /// <param name=\"cancellationToken\">The <see cref=\"CancellationToken\"/> for the request.</param>");
-		stringBuilder.Append(Environment.NewLine);
-		stringBuilder.Append("		/// <exception cref=\"ClientException\">Thrown when an object returned in a response is used for updating an object in Microsoft Graph.</exception>");
+        stringBuilder.Append(Environment.NewLine);
+        stringBuilder.Append("        /// <exception cref=\"ClientException\">Thrown when an object returned in a response is used for updating an object in Microsoft Graph.</exception>");
 	}
 
     stringBuilder.Append(Environment.NewLine);
@@ -419,6 +419,32 @@ public string GetEntityUpdateAsyncMethod(OdcmClass odcmClass, bool initializeCol
 	stringBuilder.Append(Environment.NewLine);
     stringBuilder.Append("			}");	
     stringBuilder.Append(Environment.NewLine);
+    stringBuilder.AppendFormat("            if ({0}ToUpdate.AdditionalData != null)", lowerCaseEntityName);
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("            {");
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.AppendFormat("                if ({0}ToUpdate.AdditionalData.ContainsKey(Constants.HttpPropertyNames.ResponseHeaders) ||", lowerCaseEntityName);
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.AppendFormat("                    {0}ToUpdate.AdditionalData.ContainsKey(Constants.HttpPropertyNames.StatusCode))", lowerCaseEntityName);
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("                {");
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("                    throw new ClientException(");
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("                        new Error");
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("                        {");
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("                            Code = GeneratedErrorConstants.Codes.NotAllowed,");
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.AppendFormat("                            Message = String.Format(GeneratedErrorConstants.Messages.ResponseObjectUsedForUpdate, {0}ToUpdate.GetType().Name)", lowerCaseEntityName);
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("                        });");
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("                }");
+    stringBuilder.Append(Environment.NewLine);
+    stringBuilder.Append("            }");	
+    stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("            this.ContentType = \"{0}\";", templateWriter.jsonContentType);
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.Append("            this.Method = \"PATCH\";");
diff --git a/Templates/CSharp/Base/IEntityRequest.Base.template.tt b/Templates/CSharp/Base/IEntityRequest.Base.template.tt
index f5e1b9e49..1935087bb 100644
--- a/Templates/CSharp/Base/IEntityRequest.Base.template.tt
+++ b/Templates/CSharp/Base/IEntityRequest.Base.template.tt
@@ -274,9 +274,9 @@ public void AppendUpdateAsyncMethodHeader(string entityName, string lowerCaseEnt
     {
         stringBuilder.Append(Environment.NewLine);
         stringBuilder.Append("        /// <param name=\"cancellationToken\">The <see cref=\"CancellationToken\"/> for the request.</param>");
-		stringBuilder.Append(Environment.NewLine);
-		stringBuilder.Append("		/// <exception cref=\"ClientException\">Thrown when an object returned in a response is used for updating an object in Microsoft Graph.</exception>");
-	}
+        stringBuilder.Append(Environment.NewLine);
+        stringBuilder.Append("        /// <exception cref=\"ClientException\">Thrown when an object returned in a response is used for updating an object in Microsoft Graph.</exception>");
+    }
 
     stringBuilder.Append(Environment.NewLine);
     stringBuilder.AppendFormat("        /// <returns>The updated {0}.</returns>", entityName);