diff --git a/master.cfg b/master.cfg
index a2f8af8..0613584 100644
--- a/master.cfg
+++ b/master.cfg
@@ -146,9 +146,11 @@ send to the gdb-testers mailing list."""
     # URL to find more info about what went wrong.
     text += "Log URL(s):\n"
     for ss in ss_list:
-        text += "\t<%s/%s/.git/tree/?id=%s>\n" % (git_url, name,
-                                                  get_builder_commit_id (name,
-                                                                         ss.revision))
+        commit_id = get_builder_commit_id (name, ss.revision)
+        if commit_id:
+            text += "\t<%s/%s/.git/tree/?id=%s>\n" % (git_url, name, commit_id)
+        else:
+            text += "\t<Error fetching commit ID for %s>\n" % ss.revision
 #        text += "\t<%s/%s/.git/log/?qt=grep&q=%s>\n" % (git_url, name, ss.revision)
 #        text += "\t<%sresults/%s/%s>\n" % (master_status.getBuildbotURL (), name, ss.revision)