diff --git a/src/main/java/xyz/wbsite/wsqlite/ObjectClient.java b/src/main/java/xyz/wbsite/wsqlite/ObjectClient.java
index 10de005..b62c96c 100644
--- a/src/main/java/xyz/wbsite/wsqlite/ObjectClient.java
+++ b/src/main/java/xyz/wbsite/wsqlite/ObjectClient.java
@@ -101,7 +101,9 @@ public class ObjectClient extends Client {
                     fieldsSql.append(f.getName().toUpperCase());
 
                     Object value = f.get(po);
-                    if (f.getType() == String.class) {
+                    if (value == null) {
+                        valueSql.append("NULL");
+                    } else if (f.getType() == String.class) {
                         valueSql.append("'");
                         valueSql.append(value);
                         valueSql.append("'");
@@ -195,7 +197,9 @@ public class ObjectClient extends Client {
                     sql.append(" = ");
 
                     Object value = f.get(po);
-                    if (f.getType() == String.class) {
+                    if (value == null) {
+                        sql.append("NULL");
+                    } else if (f.getType() == String.class) {
                         sql.append("'");
                         sql.append(value);
                         sql.append("'");
@@ -330,7 +334,7 @@ public class ObjectClient extends Client {
                             f.set(o, v);
                         } else if (f.getType() == Character.class || f.getType() == char.class) {
                             short v = resultSet.getShort(f.getName());
-                            f.set(o, (char)v);
+                            f.set(o, (char) v);
                         } else if (f.getType() == Integer.class || f.getType() == int.class) {
                             int v = resultSet.getInt(f.getName());
                             f.set(o, v);