From 3a9cde185ab2ab1c95d2256747764d633d1b25e1 Mon Sep 17 00:00:00 2001
From: Michael Panchenko <michael.panchenko@unternehmertum.de>
Date: Mon, 2 Jun 2025 20:06:10 +0200
Subject: [PATCH] Better error message [ci skip]

---
 src/serena/config.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/serena/config.py b/src/serena/config.py
index 57b7a686..0b9a85de 100644
--- a/src/serena/config.py
+++ b/src/serena/config.py
@@ -121,7 +121,13 @@ class SerenaAgentContext:
         try:
             return cls.from_name(str(name_or_path))
         except FileNotFoundError:
-            return cls.from_yaml(name_or_path)
+            try:
+                return cls.from_yaml(name_or_path)
+            except FileNotFoundError as e:
+                raise FileNotFoundError(
+                    f"Context {name_or_path} not found in {CONTEXT_YAMLS_DIR}. You can load a custom context by using from_yaml() instead.\n"
+                    f"Available contexts:\n{cls.list_registered_context_names()}"
+                ) from e
 
     @classmethod
     def list_registered_context_names(cls) -> list[str]: