diff --git a/pr_agent/git_providers/utils.py b/pr_agent/git_providers/utils.py
index 2b2954a7..1ca254d5 100644
--- a/pr_agent/git_providers/utils.py
+++ b/pr_agent/git_providers/utils.py
@@ -23,7 +23,7 @@ def apply_repo_settings(pr_url):
                 git_provider = get_git_provider()(pr_url)
                 repo_settings = git_provider.get_repo_settings()
                 try:
-                    context.set("repo_settings", repo_settings)
+                    context["repo_settings"] = repo_settings
                 except Exception:
                     pass
 
diff --git a/pr_agent/servers/github_app.py b/pr_agent/servers/github_app.py
index f4c0a067..ecd5a00c 100644
--- a/pr_agent/servers/github_app.py
+++ b/pr_agent/servers/github_app.py
@@ -92,7 +92,7 @@ async def handle_request(body: Dict[str, Any], event: str):
         if "comment" not in body:
             return {}
         comment_body = body.get("comment", {}).get("body")
-        if not comment_body.lsstrip().startswith("/"):
+        if comment_body and isinstance(comment_body, str) and not comment_body.lstrip().startswith("/"):
             get_logger().info("Ignoring comment not starting with /")
             return {}
         if sender and bot_user in sender: