diff --git a/jnosql-database-commons/src/main/java/org/eclipse/jnosql/communication/driver/ValueUtil.java b/jnosql-database-commons/src/main/java/org/eclipse/jnosql/communication/driver/ValueUtil.java index c9966f7d8..cd7d2d7e0 100644 --- a/jnosql-database-commons/src/main/java/org/eclipse/jnosql/communication/driver/ValueUtil.java +++ b/jnosql-database-commons/src/main/java/org/eclipse/jnosql/communication/driver/ValueUtil.java @@ -96,7 +96,9 @@ private static List getObjects(Object val) { } private static Object getObject(Object val) { - if (VALUE_WRITER.test(val.getClass())) { + if (val == null) { + return null; + } else if (VALUE_WRITER.test(val.getClass())) { return VALUE_WRITER.write(val); } return val;