diff --git a/.gitignore b/.gitignore
index a73b28fff..9be9589dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -276,4 +276,4 @@ src/frontend/temp
 .history
 
 .dspy_cache/
-cache.db
+*.db
diff --git a/src/backend/base/langflow/components/notdiamond/notdiamond.py b/src/backend/base/langflow/components/notdiamond/notdiamond.py
index e84cd777d..852a2e701 100644
--- a/src/backend/base/langflow/components/notdiamond/notdiamond.py
+++ b/src/backend/base/langflow/components/notdiamond/notdiamond.py
@@ -167,12 +167,11 @@ class NotDiamondComponent(Component):
         return self._call_get_chat_result(chosen_model, input_value, system_message)
 
     def _call_get_chat_result(self, chosen_model, input_value, system_message):
-        result = get_chat_result(
+        return get_chat_result(
             runnable=chosen_model,
             input_value=input_value,
             system_message=system_message,
         )
-        return result
 
     def _format_input(
         self,
diff --git a/src/backend/base/langflow/memory.py b/src/backend/base/langflow/memory.py
index 61461fe24..7b293c2b5 100644
--- a/src/backend/base/langflow/memory.py
+++ b/src/backend/base/langflow/memory.py
@@ -11,6 +11,7 @@ from sqlmodel import Session, col, select
 from langflow.schema.message import Message
 from langflow.services.database.models.message.model import MessageRead, MessageTable
 from langflow.services.deps import session_scope
+from langflow.utils.constants import MESSAGE_SENDER_AI, MESSAGE_SENDER_USER
 
 
 def get_messages(
@@ -162,8 +163,19 @@ def store_message(
         logger.warning("No message provided.")
         return []
 
-    if not message.session_id or not message.sender or not message.sender_name:
-        msg = "All of session_id, sender, and sender_name must be provided."
+    required_fields = ["session_id", "sender", "sender_name"]
+    missing_fields = [field for field in required_fields if not getattr(message, field)]
+    if missing_fields:
+        missing_descriptions = {
+            "session_id": "session_id (unique conversation identifier)",
+            "sender": f"sender (e.g., '{MESSAGE_SENDER_USER}' or '{MESSAGE_SENDER_AI}')",
+            "sender_name": "sender_name (display name, e.g., 'User' or 'Assistant')",
+        }
+        missing = ", ".join(missing_descriptions[field] for field in missing_fields)
+        msg = (
+            f"It looks like we're missing some important information: {missing}. "
+            "Please ensure that your message includes all the required fields."
+        )
         raise ValueError(msg)
     if hasattr(message, "id") and message.id:
         return update_messages([message])