diff --git a/lambda-petclinic/sample-apps/function2/lambda_function.py b/lambda-petclinic/sample-apps/function2/lambda_function.py
index d6f237c3..bc6dc996 100644
--- a/lambda-petclinic/sample-apps/function2/lambda_function.py
+++ b/lambda-petclinic/sample-apps/function2/lambda_function.py
@@ -18,7 +18,8 @@ def lambda_handler(event, context):
     pet_id = query_params.get('petid')
 
     try:
-        response = table.scan()
+        # Optimize scan operation with pagination limit to reduce latency
+        response = table.scan(Limit=100)
         items = response.get('Items', [])
 
         print("Record IDs in DynamoDB Table:")
@@ -40,4 +41,4 @@ def lambda_handler(event, context):
         return {
             'statusCode': 500,
             'body': json.dumps({'error': str(e)})
-        }
+        }
\ No newline at end of file
diff --git a/lambda-petclinic/sample-apps/function3-different-version/lambda_function.py b/lambda-petclinic/sample-apps/function3-different-version/lambda_function.py
index 4e701313..27bef752 100644
--- a/lambda-petclinic/sample-apps/function3-different-version/lambda_function.py
+++ b/lambda-petclinic/sample-apps/function3-different-version/lambda_function.py
@@ -22,12 +22,15 @@ def lambda_handler(event, context):
     owners = query_params.get('owners')
     pet_id = query_params.get('petid')
 
-
-    if pet_id == "111111111111":
-        raise Exception('Fail to parse the request. Cause: NullPointerException')
-
+    # Improved input validation with proper error responses
     if owners is None or pet_id is None:
-        raise Exception('Missing owner or pet_idßßßß')
+        return {
+            'statusCode': 400,
+            'body': json.dumps({'error': 'Missing required parameters: owners or petid'}),
+            'headers': {
+                'Content-Type': 'application/json'
+            }
+        }
 
     if record_id is None:
         return {