diff --git a/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java b/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
index 5c39a4f948..76529296aa 100644
--- a/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
+++ b/modules/dbsupport/src/main/java/org/jpos/ee/converter/TagsConverter.java
@@ -26,11 +26,15 @@
 public class TagsConverter implements AttributeConverter<Tags,String> {
     @Override
     public String convertToDatabaseColumn(Tags tags) {
-        return tags != null && tags.size() > 0 ? tags.toString() : "";
+        return  tags == null ?
+                null :
+                tags.size() > 0 ? tags.toString() : "";
     }
 
     @Override
     public Tags convertToEntityAttribute(String dbData) {
-        return new Tags(dbData);
+        return  dbData != null ?
+                new Tags(dbData) :
+                null;
     }
 }