RehanSaeed
diff --git a/‎Source/Common/SchemaEnumJsonConverter{T}.cs
Copy file name to clipboardExpand all lines: Source/Common/SchemaEnumJsonConverter{T}.cs
+14-1Lines changed: 14 additions & 1 deletion b/‎Source/Common/SchemaEnumJsonConverter{T}.cs
Copy file name to clipboardExpand all lines: Source/Common/SchemaEnumJsonConverter{T}.cs
+14-1Lines changed: 14 additions & 1 deletion
diff --git a/‎Source/Common/ValuesJsonConverter.cs
Copy file name to clipboardExpand all lines: Source/Common/ValuesJsonConverter.cs
+2-2Lines changed: 2 additions & 2 deletions b/‎Source/Common/ValuesJsonConverter.cs
Copy file name to clipboardExpand all lines: Source/Common/ValuesJsonConverter.cs
+2-2Lines changed: 2 additions & 2 deletions
@@ -41,6 +41,11 @@ public SchemaEnumJsonConverter()
         /// <returns>The enumeration value.</returns>
         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
+            if (typeToConvert is null)
+            {
+                throw new ArgumentNullException(nameof(typeToConvert));
+            }
+
             var valueString = reader.GetString();
             if (EnumHelper.TryParseEnumFromSchemaUri(typeToConvert, valueString, out var result))
             {
@@ -56,6 +61,14 @@ public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerial
         /// <param name="writer">The JSON writer.</param>
         /// <param name="value">The enumeration value.</param>
         /// <param name="options">The JSON serializer options.</param>
-        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options) => writer.WriteStringValue(this.valueNameMap[value]);
+        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+        {
+            if (writer is null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
+            writer.WriteStringValue(this.valueNameMap[value]);
+        }
     }
 }
@@ -177,7 +177,7 @@ public virtual void WriteObject(Utf8JsonWriter writer, object? value, JsonSerial
             }
             else if (value is decimal decimalNumber)
             {
-                //TODO: Potential unnecessary allocation - may be able to write to a stackalloc span.
+                // TODO: Potential unnecessary allocation - may be able to write to a stackalloc span.
                 writer.WriteRawValue(decimalNumber.ToString("G0", CultureInfo.InvariantCulture));
             }
             else if (value is double doubleNumber)
@@ -407,7 +407,7 @@ private static bool TryGetConcreteType(
                 try
                 {
                     var localType = Type.GetType(typeName, false);
-                    if (typeof(IThing).IsAssignableFrom(localType))
+                    if (localType is not null && typeof(IThing).IsAssignableFrom(localType))
                     {
                         type = localType;
                         return true;
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public virtual void WriteObject(Utf8JsonWriter writer, object? value, JsonSerial`
`177`	`177`	`}`
`178`	`178`	`else if (value is decimal decimalNumber)`
`179`	`179`	`{`
`180`		`- //TODO: Potential unnecessary allocation - may be able to write to a stackalloc span.`
	`180`	`+ // TODO: Potential unnecessary allocation - may be able to write to a stackalloc span.`
`181`	`181`	`writer.WriteRawValue(decimalNumber.ToString("G0", CultureInfo.InvariantCulture));`
`182`	`182`	`}`
`183`	`183`	`else if (value is double doubleNumber)`
`@@ -407,7 +407,7 @@ private static bool TryGetConcreteType(`
`407`	`407`	`try`
`408`	`408`	`{`
`409`	`409`	`var localType = Type.GetType(typeName, false);`
`410`		`- if (typeof(IThing).IsAssignableFrom(localType))`
	`410`	`+ if (localType is not null && typeof(IThing).IsAssignableFrom(localType))`
`411`	`411`	`{`
`412`	`412`	`type = localType;`
`413`	`413`	`return true;`