diff --git a/pkg/evolution/drafts.go b/pkg/evolution/drafts.go
index 0d48d6605..6b9e93fd8 100644
--- a/pkg/evolution/drafts.go
+++ b/pkg/evolution/drafts.go
@@ -67,7 +67,10 @@ type DefaultDraftGenerator struct {
 func NewDefaultDraftGenerator(workspace string) *DefaultDraftGenerator {
 	builtinSkillsDir := strings.TrimSpace(os.Getenv(config.EnvBuiltinSkills))
 	if builtinSkillsDir == "" {
-		wd, _ := os.Getwd()
+		wd, err := os.Getwd()
+		if err != nil {
+			wd = config.GetHome()
+		}
 		builtinSkillsDir = filepath.Join(wd, "skills")
 	}
 
diff --git a/pkg/evolution/skills_recall.go b/pkg/evolution/skills_recall.go
index fb7d2dfcc..f89a8e132 100644
--- a/pkg/evolution/skills_recall.go
+++ b/pkg/evolution/skills_recall.go
@@ -18,7 +18,10 @@ type SkillsRecaller struct {
 func NewSkillsRecaller(workspace string) *SkillsRecaller {
 	builtinSkillsDir := strings.TrimSpace(os.Getenv(config.EnvBuiltinSkills))
 	if builtinSkillsDir == "" {
-		wd, _ := os.Getwd()
+		wd, err := os.Getwd()
+		if err != nil {
+			wd = config.GetHome()
+		}
 		builtinSkillsDir = filepath.Join(wd, "skills")
 	}