diff --git a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java
index 9926f1aee7beadb98312bc6493bdd7fa9f1b54c5..05d150df5a7856d31c070978a6b1fd7ce53eed52 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.runtime/src/org/etsi/mts/tdl/execution/java/adapters/http/HttpSystemAdapter.java
@@ -249,6 +249,8 @@ public class HttpSystemAdapter implements SystemAdapter {
 	}
 
 	protected Object decodeBody(String body, Class<?> type) throws IOException {
+		if (body.length() == 0)
+			return null;
 		return this.mapper.readValue(body, type);
 	}