diff --git a/pr_agent/servers/github_app.py b/pr_agent/servers/github_app.py
index d72ae1fd..3f793551 100644
--- a/pr_agent/servers/github_app.py
+++ b/pr_agent/servers/github_app.py
@@ -219,14 +219,20 @@ def handle_closed_pr(body, event, action, log_context):
 
 
 def get_log_context(body, event, action, build_number):
-    sender = body.get("sender", {}).get("login")
-    sender_id = body.get("sender", {}).get("id")
-    repo = body.get("repository", {}).get("full_name", "")
-    org = body.get("organization", {}).get("login", "")
-    app_name = get_settings().get("CONFIG.APP_NAME", "Unknown")
-    log_context = {"action": action, "event": event, "sender": sender, "server_type": "github_app",
-                   "request_id": uuid.uuid4().hex, "build_number": build_number, "app_name": app_name,
-                   "repo": repo, "org": org}
+    sender = ""
+    sender_id = ""
+    try:
+        sender = body.get("sender", {}).get("login")
+        sender_id = body.get("sender", {}).get("id")
+        repo = body.get("repository", {}).get("full_name", "")
+        org = body.get("organization", {}).get("login", "")
+        app_name = get_settings().get("CONFIG.APP_NAME", "Unknown")
+        log_context = {"action": action, "event": event, "sender": sender, "server_type": "github_app",
+                       "request_id": uuid.uuid4().hex, "build_number": build_number, "app_name": app_name,
+                       "repo": repo, "org": org}
+    except Exception as e:
+        get_logger().error("Failed to get log context", e)
+        log_context = {}
     return log_context, sender, sender_id