diff --git a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java
index 3c474d9cd..a57ed5adf 100644
--- a/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java
+++ b/aws-serverless-java-container-core/src/main/java/com/amazonaws/serverless/proxy/internal/servlet/AwsProxyHttpServletRequest.java
@@ -816,9 +816,11 @@ private String getQueryParamValue(String key, boolean isCaseSensitive) {
             return request.getQueryStringParameters().get(key);
         }
 
-        for (String k : request.getQueryStringParameters().keySet()) {
-            if (k.toLowerCase(Locale.getDefault()).equals(key.toLowerCase(Locale.getDefault()))) {
-                return request.getQueryStringParameters().get(k);
+        if (request.getQueryStringParameters() != null) {
+            for (String k : request.getQueryStringParameters().keySet()) {
+                if (k.toLowerCase(Locale.getDefault()).equals(key.toLowerCase(Locale.getDefault()))) {
+                    return request.getQueryStringParameters().get(k);
+                }
             }
         }