diff --git a/highfive/configs/rust-lang/rust.json b/highfive/configs/rust-lang/rust.json
index 26304b0c..e33b7aa7 100755
--- a/highfive/configs/rust-lang/rust.json
+++ b/highfive/configs/rust-lang/rust.json
@@ -47,10 +47,6 @@
             "command": "@highfive: run-doc-ui",
             "reviewers": ["@GuillaumeGomez"]
         },
-        "src/doc": {
-            "message": "Some changes occurred in HTML/CSS.",
-            "reviewers": ["@GuillaumeGomez"]
-        },
         "src/librustdoc/": {
             "command": "@highfive: run-doc-ui"
         },
diff --git a/highfive/newpr.py b/highfive/newpr.py
index a29fcf19..e3d00441 100644
--- a/highfive/newpr.py
+++ b/highfive/newpr.py
@@ -130,8 +130,12 @@ def set_assignee(self, assignee, owner, repo, issue, user, author, to_mention):
             for mention in to_mention:
                 if len(message) > 0:
                     message += '\n\n'
-                message += "%s\n\ncc %s" % (mention['message'],
-                                            ','.join([x for x in mention['reviewers'] if x != user]))
+                msg = mention.get('message')
+                if msg is not None:
+                    msg += '\n\n'
+                else:
+                    msg = ''
+                message += "%scc %s" % (msg, ','.join([x for x in mention['reviewers'] if x != user]))
                 cmd = mention.get('command')
                 if cmd is not None:
                     commands[cmd] = self.payload['pull_request', 'head', 'sha']