diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index ffb92c73337b416d41650c0003a52cb8e87f02e2..1b05b7eb62cf5d478a90ce6a460eb66b949f0fea 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -1226,6 +1226,10 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
                                 id = elt.getAttribute("id");
                                 valueAtt = elt.getAttribute("value");
 
+                                if (valueAtt == null) {
+                                    valueAtt = "";
+                                }
+
                                 if (valueAtt.equals("null")) {
                                     valueAtt = "";
                                 }
diff --git a/src/main/java/ui/avatarbd/AvatarBDDataType.java b/src/main/java/ui/avatarbd/AvatarBDDataType.java
index 3e5cf47a590217978f3e42ce16a89a7c12da4b3a..8ccc157bff1a2fd78a1693dc7f08224bc7be720d 100644
--- a/src/main/java/ui/avatarbd/AvatarBDDataType.java
+++ b/src/main/java/ui/avatarbd/AvatarBDDataType.java
@@ -513,6 +513,11 @@ public class AvatarBDDataType extends TGCScalableWithInternalComponent implement
                                 id = elt.getAttribute("id");
                                 valueAtt = elt.getAttribute("value");
 
+
+                                if (valueAtt == null) {
+                                    valueAtt = "";
+                                }
+
                                 if (valueAtt.equals("null")) {
                                     valueAtt = "";
                                 }