diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java
index 93bfde19d..dfbc067c7 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java
@@ -85,6 +85,9 @@ public void handleRequest(InputStream input, OutputStream output, Context contex
 		if (!this.started) {
 			this.start();
 		}
+		if (context == null) {
+			logger.warn("Lambda is invoked with null Context");
+		}
 		Message requestMessage = AWSLambdaUtils
 				.generateMessage(input, this.function.getInputType(), this.function.isSupplier(), jsonMapper, context);