diff --git a/internal/executor/executor.go b/internal/executor/executor.go
index 77eb783..3612ef3 100644
--- a/internal/executor/executor.go
+++ b/internal/executor/executor.go
@@ -332,6 +332,10 @@ func stepACLCheck(req *ExecutionRequest) bool {
 func stepParseArgs(req *ExecutionRequest) bool {
 	var err error
 
+	if req.Arguments == nil {
+		req.Arguments = make(map[string]string)
+	}
+
 	req.Arguments["ot_executionTrackingId"] = req.TrackingID
 	req.Arguments["ot_username"] = req.AuthenticatedUser.Username
 
diff --git a/internal/httpservers/restapi.go b/internal/httpservers/restapi.go
index 0d91ec0..3d9aee5 100644
--- a/internal/httpservers/restapi.go
+++ b/internal/httpservers/restapi.go
@@ -57,8 +57,8 @@ func parseRequestMetadata(ctx context.Context, req *http.Request) metadata.MD {
 		username, usergroup = parseHttpHeaderForAuth(req)
 	}
 
-	md := metadata.New(map[string]string {
-		"username": username,
+	md := metadata.New(map[string]string{
+		"username":  username,
 		"usergroup": usergroup,
 	})