diff --git a/src/main/java/es/jaimetruman/Utils.java b/src/main/java/es/jaimetruman/Utils.java
index f4c9e02..be2425e 100644
--- a/src/main/java/es/jaimetruman/Utils.java
+++ b/src/main/java/es/jaimetruman/Utils.java
@@ -18,7 +18,9 @@ public static String buildString (String... strings) {
     public static String formatValue (Object value) {
         String formatted;
 
-        if(value instanceof String || value instanceof UUID){
+        if(value == null){
+            return null;
+        }else if(value instanceof String || value instanceof UUID){
             formatted = "'" + value.toString() + "'";
         }else if (value instanceof Boolean) {
             formatted = (Boolean) value ? "1" : "0";