diff --git a/src/main/java/com/olympus/hermione/tools/DocAndSourceCodeTool.java b/src/main/java/com/olympus/hermione/tools/DocAndSourceCodeTool.java
index 559835f..222126d 100644
--- a/src/main/java/com/olympus/hermione/tools/DocAndSourceCodeTool.java
+++ b/src/main/java/com/olympus/hermione/tools/DocAndSourceCodeTool.java
@@ -8,8 +8,6 @@ import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.cloud.client.ServiceInstance;
-
-
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.web.client.RestTemplate;
 
@@ -85,6 +83,11 @@ public class DocAndSourceCodeTool {
         similaritySearchCodeInput.setTopK("3");
         similaritySearchCodeInput.setSimilarityThreshold("0.7");
         similaritySearchCodeInput.setFilterExpression("'ksApplicationName' == '" + this.application+"'");
+
+        if(this.application == null || this.application.isEmpty()){
+            return " Cannot retrieve any source code without an application. Avoid using this tool again.";
+        }
+
         logger.info("[TOOL]LLM SourceCodeTool getCodeBySimilarity filterExpression: " + similaritySearchCodeInput.getFilterExpression());        
         ServiceInstance serviceInstance = discoveryClient.getInstances("source-code-module").get(0);
         RestTemplate restTemplate = new RestTemplate();