diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
index 68e417e31e0fc6ea75d969fb3095265e46327b63..523dfb3470ce4d1c02d9055c14615a96e8777ab4 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
@@ -1946,16 +1946,23 @@ public class JUnitTestGenerator extends Renderer {
 
 		} else {
 			ParameterMapping mapping = getParameterMapping(p);
-			if (hasAnnotation(mapping, MAPPING_ANNOTATION_SETTER)) {
-				append(mapping.getParameterURI());
-				append("(");
-				write(v, dataUseVariables);
-				append(")");
+			if (mapping != null) {
+				if (hasAnnotation(mapping, MAPPING_ANNOTATION_SETTER)) {
+					append(mapping.getParameterURI());
+					append("(");
+					write(v, dataUseVariables);
+					append(")");
 
+				} else {
+					append(mapping.getParameterURI());
+					append(" = ");
+					write(v, dataUseVariables);
+				}
 			} else {
-				append(mapping.getParameterURI());
+				append(p.getName());
 				append(" = ");
 				write(v, dataUseVariables);
+				lineComment(" Parameter not mapped");
 			}
 		}
 	}