diff --git a/modules/dbsupport/src/main/java/org/jpos/ee/usertype/TagsType.java b/modules/dbsupport/src/main/java/org/jpos/ee/usertype/TagsType.java
index b1d6bc5650..7c95584b32 100644
--- a/modules/dbsupport/src/main/java/org/jpos/ee/usertype/TagsType.java
+++ b/modules/dbsupport/src/main/java/org/jpos/ee/usertype/TagsType.java
@@ -95,7 +95,9 @@ public Object assemble(Serializable cached, Object owner) throws HibernateExcept
 
     @Override
     public Object replace(Object original, Object target, Object owner) throws HibernateException {
-        return new Tags(original.toString());
+        if (original != null)
+            return new Tags(original.toString());
+        return null;
     }
 }