diff --git a/handler_utils/debug.go b/handler_utils/debug.go
index aa7201c701ccc0a78ed2f067697df6fb408c69a1..cd5f693480c1de0e0157fb0b13d71fe4a7cd433c 100644
--- a/handler_utils/debug.go
+++ b/handler_utils/debug.go
@@ -18,7 +18,7 @@ import (
 // HTTP functions
 // ========================================================================
 
-func ServeHTTPFunctions(lambdaHandler lambda.Handler, w http.ResponseWriter, req *http.Request) {
+func ServeHTTPFunctions(ctx context.Context, lambdaHandler lambda.Handler, w http.ResponseWriter, req *http.Request) {
 
 	// Read body
 	buf := new(bytes.Buffer)
@@ -46,7 +46,6 @@ func ServeHTTPFunctions(lambdaHandler lambda.Handler, w http.ResponseWriter, req
 	}
 
 	jsonRequest, _ := json.Marshal(request)
-	ctx := context.Background()
 	responseBytes, err := lambdaHandler.Invoke(ctx, jsonRequest)
 	if err != nil {
 		panic(err)
@@ -68,7 +67,7 @@ func ServeHTTPFunctions(lambdaHandler lambda.Handler, w http.ResponseWriter, req
 // SQS Functions
 // ========================================================================
 
-func ServeSQSFunctions(lambdaHandler lambda.Handler, w http.ResponseWriter, req *http.Request) {
+func ServeSQSFunctions(ctx context.Context, lambdaHandler lambda.Handler, w http.ResponseWriter, req *http.Request) {
 
 	// Read body
 	buf := new(bytes.Buffer)
@@ -97,7 +96,6 @@ func ServeSQSFunctions(lambdaHandler lambda.Handler, w http.ResponseWriter, req
 		},
 	})
 
-	ctx := context.Background()
 	responseBytes, err := lambdaHandler.Invoke(ctx, sqsRequest)
 	if err != nil {
 		panic(err)
@@ -107,10 +105,9 @@ func ServeSQSFunctions(lambdaHandler lambda.Handler, w http.ResponseWriter, req
 	response := map[string]any{}
 	err = json.Unmarshal(responseBytes, &response)
 	if err != nil {
+		_, _ = io.WriteString(w, err.Error())
 		return
 	}
 
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(int(response["statusCode"].(float64)))
-	_, _ = io.WriteString(w, response["body"].(string))
+	_, _ = io.WriteString(w, "done")
 }