diff --git a/xml/System.Text.Json/JsonSerializer.xml b/xml/System.Text.Json/JsonSerializer.xml
index 14529c84a29..53ef8966d78 100644
--- a/xml/System.Text.Json/JsonSerializer.xml
+++ b/xml/System.Text.Json/JsonSerializer.xml
@@ -65,7 +65,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
         <exception cref="T:System.ArgumentNullException">
           <paramref name="returnType" /> is <see langword="null" />.</exception>
         <exception cref="T:System.Text.Json.JsonException">The JSON is invalid.
-          
+
 -or-
 
 <typeparamref name="returnType" /> is not compatible with the JSON.
@@ -73,6 +73,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 -or-
 
 There is remaining data in the span beyond a single JSON value.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="returnType"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Deserialize">
@@ -124,6 +125,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 -or-
 
 There is remaining data in the string beyond a single JSON value.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="returnType"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Deserialize">
@@ -166,7 +168,6 @@ This method makes a copy of the data the reader acted on, so there is no caller
 The <xref:System.Text.Json.JsonReaderOptions> used to create the instance of the <xref:System.Text.Json.Utf8JsonReader> take precedence over the <xref:System.Text.Json.JsonSerializerOptions> when they conflict. Hence, <xref:System.Text.Json.JsonReaderOptions.AllowTrailingCommas?displayProperty=nameWithType>, <xref:System.Text.Json.JsonReaderOptions.MaxDepth?displayProperty=nameWithType>, and <xref:System.Text.Json.JsonReaderOptions.CommentHandling?displayProperty=nameWithType> are used while reading.
 
 For more information, see [How to serialize and deserialize JSON](~/docs/standard/serialization/system-text-json-how-to.md).
-               
           ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
@@ -182,6 +183,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 A value could not be read from the reader.</exception>
         <exception cref="T:System.ArgumentException">
           <paramref name="reader" /> is using unsupported options.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="returnType"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Deserialize&lt;TValue&gt;">
@@ -222,7 +224,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
  ]]></format>
         </remarks>
         <exception cref="T:System.Text.Json.JsonException">The JSON is invalid.
-          
+
 -or-
 
 <typeparamref name="TValue" /> is not compatible with the JSON.
@@ -230,6 +232,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 -or-
 
 There is remaining data in the span beyond a single JSON value.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <typeparamref name="TValue"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Deserialize&lt;TValue&gt;">
@@ -274,7 +277,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
         <exception cref="T:System.ArgumentNullException">
           <paramref name="json" /> is <see langword="null" />.</exception>
         <exception cref="T:System.Text.Json.JsonException">The JSON is invalid.
-          
+
 -or-
 
 <typeparamref name="TValue" /> is not compatible with the JSON.
@@ -282,6 +285,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 -or-
 
 There is remaining data in the string beyond a single JSON value.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <typeparamref name="TValue"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Deserialize&lt;TValue&gt;">
@@ -330,7 +334,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
           ]]></format>
         </remarks>
         <exception cref="T:System.Text.Json.JsonException">The JSON is invalid.
-          
+
 -or-
 
 <typeparamref name="TValue" /> is not compatible with the JSON.
@@ -340,6 +344,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 A value could not be read from the reader.</exception>
         <exception cref="T:System.ArgumentException">
           <paramref name="reader" /> uses unsupported options.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <typeparamref name="TValue"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="DeserializeAsync">
@@ -382,7 +387,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
         <exception cref="T:System.ArgumentNullException">
           <paramref name="utf8Json" /> or <paramref name="returnType" /> is <see langword="null" />.</exception>
         <exception cref="T:System.Text.Json.JsonException">The JSON is invalid.
-          
+
 -or-
 
 <typeparamref name="TValue" /> is not compatible with the JSON.
@@ -390,6 +395,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 -or-
 
 There is remaining data in the stream.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="returnType"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="DeserializeAsync&lt;TValue&gt;">
@@ -432,7 +438,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
  ]]></format>
         </remarks>
         <exception cref="T:System.Text.Json.JsonException">The JSON is invalid.
-          
+
 -or-
 
 <typeparamref name="TValue" /> is not compatible with the JSON.
@@ -440,6 +446,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 -or-
 
 There is remaining data in the stream.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <typeparamref name="TValue"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Serialize">
@@ -479,6 +486,9 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 
           ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentException"><paramref name="inputType"/> is not compatible with <paramref name="value"/>.</exception>
+        <exception cref="T:System.ArgumentNullException"><paramref name="inputType" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="inputType"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Serialize">
@@ -519,8 +529,10 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 
           ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentException"><paramref name="inputType"/> is not compatible with <paramref name="value"/></exception>
         <exception cref="T:System.ArgumentNullException">
-          <paramref name="writer" /> is <see langword="null" />.</exception>
+          <paramref name="writer" /> or <paramref name="inputType" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="inputType"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Serialize&lt;TValue&gt;">
@@ -562,6 +574,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 
           ]]></format>
         </remarks>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <typeparamref name="TValue"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="Serialize&lt;TValue&gt;">
@@ -606,6 +619,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="writer" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <typeparamref name="TValue"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="SerializeAsync">
@@ -647,8 +661,10 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentException"><paramref name="inputType"/> is not compatible with <paramref name="value"/>.</exception>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="utf8Json" /> or <paramref name="inputType" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="inputType"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="SerializeAsync&lt;TValue&gt;">
@@ -694,6 +710,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="utf8Json" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <typeparamref name="TValue"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="SerializeToUtf8Bytes">
@@ -731,6 +748,9 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentException"><paramref name="inputType"/> is not compatible with <paramref name="value"/>.</exception>
+        <exception cref="T:System.ArgumentNullException"><paramref name="inputType" /> is <see langword="null" />.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="inputType"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="SerializeToUtf8Bytes&lt;TValue&gt;">
@@ -770,6 +790,7 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 
  ]]></format>
         </remarks>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <typeparamref name="TValue"/> or its serializable members.</exception>
       </Docs>
     </Member>
   </Members>
diff --git a/xml/System.Text.Json/JsonSerializerOptions.xml b/xml/System.Text.Json/JsonSerializerOptions.xml
index b9308b9224e..233c5858439 100644
--- a/xml/System.Text.Json/JsonSerializerOptions.xml
+++ b/xml/System.Text.Json/JsonSerializerOptions.xml
@@ -246,6 +246,8 @@ For more information, see [How to serialize and deserialize JSON](~/docs/standar
 
  ]]></format>
         </remarks>
+        <exception cref="T:System.InvalidOperationException">The configured <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="typeToConvert"/> returned an invalid converter.</exception>
+        <exception cref="T:System.NotSupportedException">There is no compatible <see cref="System.Text.Json.Serialization.JsonConverter"/> for <paramref name="typeToConvert"/> or its serializable members.</exception>
       </Docs>
     </Member>
     <Member MemberName="IgnoreNullValues">