dengweiwen
diff --git a/‎src/Npgsql.Json.NET/JsonHandler.cs‎
Lines changed: 3 additions & 0 deletions b/‎src/Npgsql.Json.NET/JsonHandler.cs‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Npgsql.Json.NET/JsonbHandler.cs‎
Lines changed: 3 additions & 0 deletions b/‎src/Npgsql.Json.NET/JsonbHandler.cs‎
Lines changed: 3 additions & 0 deletions
@@ -86,6 +86,9 @@ protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLength
 
         protected override Task WriteObjectWithLength(object value, NpgsqlWriteBuffer buf, NpgsqlLengthCache lengthCache, NpgsqlParameter parameter, bool async)
         {
+            if (value == null || value is DBNull)
+                return base.WriteObjectWithLength(value, buf, lengthCache, parameter, async);
+
             if (parameter?.ConvertedValue != null)
                 value = parameter.ConvertedValue;
             var s = value as string ?? JsonConvert.SerializeObject(value, _settings);
 
@@ -86,6 +86,9 @@ protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLength
 
         protected override Task WriteObjectWithLength(object value, NpgsqlWriteBuffer buf, NpgsqlLengthCache lengthCache, NpgsqlParameter parameter, bool async)
         {
+            if (value == null || value is DBNull)
+                return base.WriteObjectWithLength(value, buf, lengthCache, parameter, async);
+
             if (parameter?.ConvertedValue != null)
                 value = parameter.ConvertedValue;
             var s = value as string ?? JsonConvert.SerializeObject(value, _settings);
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ protected override int ValidateObjectAndGetLength(object value, ref NpgsqlLength`
`86`	`86`
`87`	`87`	`protected override Task WriteObjectWithLength(object value, NpgsqlWriteBuffer buf, NpgsqlLengthCache lengthCache, NpgsqlParameter parameter, bool async)`
`88`	`88`	`{`
	`89`	`+ if (value == null \|\| value is DBNull)`
	`90`	`+ return base.WriteObjectWithLength(value, buf, lengthCache, parameter, async);`
	`91`	`+`
`89`	`92`	`if (parameter?.ConvertedValue != null)`
`90`	`93`	`value = parameter.ConvertedValue;`
`91`	`94`	`var s = value as string ?? JsonConvert.SerializeObject(value, _settings);`