diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
index 4a0b2a4b02aa82d0eeba21a66b107d6a4710defa..c7d57c73e865037cb0de13372ed4105e3ae58e06 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
@@ -787,12 +787,16 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
     public String toString() {
         String ret = getValue();
 
+        if (ret == null) {
+            ret = "";
+        }
+
         ret += "ID=" + id;
 
         ret += " " + text;
         ret += " criticality=" + criticality;
 
-        if (SIZE_LIMIT > 0) {
+        if ((SIZE_LIMIT > 0) && (ret.length() > SIZE_LIMIT)){
             ret = ret.substring(0, SIZE_LIMIT) + "...";
         }