diff --git a/src/main/java/avatartranslator/AvatarAttribute.java b/src/main/java/avatartranslator/AvatarAttribute.java
index 0edec7c78afcae6ef42b8a316b4f7f1f96cd1b16..de1c97c7dc58771e8d5cfb92eb7a8dce24aa41d9 100644
--- a/src/main/java/avatartranslator/AvatarAttribute.java
+++ b/src/main/java/avatartranslator/AvatarAttribute.java
@@ -56,7 +56,7 @@ public class AvatarAttribute extends AvatarLeftHand implements NameChecker.NameS
 
     // Types of parameters
     private AvatarType type;
-    private String initialValue;
+    private String initialValue; // optional
     private boolean isConstant;
     private AvatarDataType dataType;
 
@@ -92,6 +92,7 @@ public class AvatarAttribute extends AvatarLeftHand implements NameChecker.NameS
         }
         return initialValue;
     }
+
     public String getProvidedInitialValue() {
         if (initialValue == null) return "";
         return initialValue;
diff --git a/src/main/java/avatartranslator/AvatarSyntaxChecker.java b/src/main/java/avatartranslator/AvatarSyntaxChecker.java
index 9ba472ee87ffe22be83a1b9b62746e8d406a8141..351d5c44a6ba4265e89503900d64388e55f6c7d8 100644
--- a/src/main/java/avatartranslator/AvatarSyntaxChecker.java
+++ b/src/main/java/avatartranslator/AvatarSyntaxChecker.java
@@ -543,7 +543,13 @@ public class AvatarSyntaxChecker {
                     if (asme instanceof AvatarActionOnSignal) {
                         AvatarActionOnSignal aaos = (AvatarActionOnSignal)asme;
                         AvatarSignal sig = aaos.getSignal();
-                        if (aaos.getValues().size() != sig.getListOfAttributes().size()) {
+                        if (( sig.getListOfAttributes() == null) || (aaos.getValues() == null)) {
+                            AvatarError error = new AvatarError(avspec);
+                            error.block = block;
+                            error.firstAvatarElement = aaos;
+                            error.error = 16;
+                            errors.add(error);
+                        } else if (aaos.getValues().size() != sig.getListOfAttributes().size()) {
                             AvatarError error = new AvatarError(avspec);
                             error.block = block;
                             error.firstAvatarElement = aaos;
diff --git a/src/main/java/ui/AvatarPanelDrawer.java b/src/main/java/ui/AvatarPanelDrawer.java
index 0d85fcec2cca08899ab1a765e0a13ecb9280b9e7..ff503bc9f09ad78dead203cb5dcf06712751fd4e 100644
--- a/src/main/java/ui/AvatarPanelDrawer.java
+++ b/src/main/java/ui/AvatarPanelDrawer.java
@@ -545,9 +545,6 @@ public class AvatarPanelDrawer {
 			// Guard
 			SMDCon.setTransitionInfo(t.getGuard(useOriginalValuesFirst), action);
 
-			// Transition Law
-			SMDCon.setTransitionDelayDistributionLaw(t.getDelayDistributionLaw() + "", t.getDelayExtra1(), t.getDelayExtra2());
-
 			// Probability
 			if (t.getProbability() != t.DEFAULT_PROBABILITY) SMDCon.setTransitionProbability("" + (t.getProbability()));
 
@@ -556,6 +553,7 @@ public class AvatarPanelDrawer {
 				SMDCon.setTransitionInfo("", t.getAction(i, useOriginalValuesFirst).replaceAll(" ", ""));
 			}
 
+			// Transition Law
 			SMDCon.setTransitionProbability(t.getDelayDistributionLaw(), t.getDelayExtra1(), t.getDelayExtra2());
 
 			smp.addComponent(SMDCon, p1.getX(), p1.getY(), false, true);
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDConnector.java b/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
index 0851cdbc447e8b10cdbeb9d2abe1d0b20e5396ed..107790ad1fb4d5b7784db021027e9bc6d698f9d4 100644
--- a/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
@@ -118,13 +118,6 @@ public class AvatarSMDConnector extends TGConnectorWithCommentConnectionPoints i
             tgc.addAction(action);
         }
     }
-    
-    public void setTransitionDelayDistributionLaw(String delayDistributionLaw, String delayExtra1, String delayExtra2) {
-        AvatarSMDTransitionInfo tgc = getAvatarSMDTransitionInfo();
-            tgc.setExtraDelay1(delayExtra1);
-            tgc.setExtraDelay2(delayExtra2);
-            tgc.setDelayDistributionLaw(delayDistributionLaw);
-    }
 
     public void setTransitionProbability(String probability) {
         AvatarSMDTransitionInfo tgc = getAvatarSMDTransitionInfo();
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java b/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
index ed1f4e8a6ab4f6970d70579f1b8269e5fa99839e..a6e517f541c987fd5e5978e2776ed8727a5d4ca8 100755
--- a/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
@@ -190,12 +190,6 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
         probability.setText( s );
     }
     
-    public void  setExtraDelay1(String s) { extraDelay1.setText(s); }
-
-    public void  setExtraDelay2(String s) { extraDelay2.setText(s); }
-
-    public void  setDelayDistributionLaw(String s) { delayDistributionLaw.setText(s); }
-
     public void addAction(String s){
     	listOfActions.add( new Expression( s ) );
 //        listOfActions.add(s);