diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/TestController.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/TestController.java
index 9d07be82..6a007d8c 100644
--- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/TestController.java
+++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/TestController.java
@@ -97,7 +97,7 @@ public class TestController {
 			return null;
 		}
 	}
-
+	
 	private RunScenarioResultModel buildWith(UUID runId) {
 		RunScenarioResultModel result = new RunScenarioResultModel();
 		result.setRunId(runId);
diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/Scenario.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/Scenario.java
index 575924d0..ebb0f03d 100644
--- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/Scenario.java
+++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/scenario/Scenario.java
@@ -143,14 +143,16 @@ public class Scenario {
 		UsePlugin usePlugin = new UsePlugin();
 		usePlugin.setId(usePluginModel.getId());
 		usePlugin.setName(usePluginModel.getName());
-		usePlugin.setParameters(new Parameter[usePluginModel.getParameters()
-				.size()]);
-		int k = 0;
-		for (k = 0; k < usePluginModel.getParameters().size(); k++) {
-			ParameterModel parameterModel = usePluginModel.getParameters().get(
-					k);
-			Parameter parameter = extractParameter(parameterModel);
-			usePlugin.getParameters()[k] = parameter;
+		if (usePluginModel.getParameters() != null) {
+			usePlugin.setParameters(new Parameter[usePluginModel
+					.getParameters().size()]);
+			int k = 0;
+			for (k = 0; k < usePluginModel.getParameters().size(); k++) {
+				ParameterModel parameterModel = usePluginModel.getParameters()
+						.get(k);
+				Parameter parameter = extractParameter(parameterModel);
+				usePlugin.getParameters()[k] = parameter;
+			}
 		}
 		return usePlugin;
 	}