Fixed NullPointerException identified in bug 1504#1505

digithead1011 wants to merge 5 commits intoaws:mainaws/serverless-java-container:mainfrom

digithead1011:maindigithead1011/serverless-java-container:mainCopy head branch name to clipboard