diff --git a/infra/pr_helper.py b/infra/pr_helper.py
index da5e6062d..4d93b24a5 100644
--- a/infra/pr_helper.py
+++ b/infra/pr_helper.py
@@ -243,6 +243,9 @@ class GithubHandler:
       if i >= COMMITS_LIMIT:
         break
 
+      if not commit['author'] or not commit['commit']:
+        continue
+
       login = commit['author']['login']
       verified = commit['commit']['verification']['verified']
       if login in self._maintainers: