diff --git a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/mode/stateful/client/code/context/ondemand/CodeContextBuilder.java b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/mode/stateful/client/code/context/ondemand/CodeContextBuilder.java
index 6e9b201..f09d62c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/chatgpt/mode/stateful/client/code/context/ondemand/CodeContextBuilder.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/chatgpt/mode/stateful/client/code/context/ondemand/CodeContextBuilder.java
@@ -32,8 +32,12 @@
 
     public String buildCodeContext(ChatGptGetContextContent getContextContent) {
         log.debug("Building code context for {}", getContextContent);
+        List<ChatGptGetContextItem> replies = getContextContent.getReplies();
+        if (replies == null || replies.isEmpty()) {
+            return CONTEXT_NOT_PROVIDED;
+        }
         List<GetContextOutputItem> getContextOutput = new ArrayList<>();
-        for (ChatGptGetContextItem chatGptGetContextItem : getContextContent.getReplies()) {
+        for (ChatGptGetContextItem chatGptGetContextItem : replies) {
             IEntityLocator entityLocator;
             try {
                 entityLocator = getEntityLocator(chatGptGetContextItem, config, change, gitRepoFiles);