diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp
index cca7628..398567b 100644
--- a/lib/Lex/PPExpressions.cpp
+++ b/lib/Lex/PPExpressions.cpp
@@ -131,7 +131,7 @@
   
   switch (PeekTok.getKind()) {
   default:  // Non-value token.
-    PP.Diag(PeekTok, diag::err_pp_expr_bad_token);
+    PP.Diag(PeekTok, diag::err_pp_expr_bad_token_start_expr);
     return true;
   case tok::eom:
   case tok::r_paren:
@@ -349,7 +349,7 @@
   unsigned PeekPrec = getPrecedence(PeekTok.getKind());
   // If this token isn't valid, report the error.
   if (PeekPrec == ~0U) {
-    PP.Diag(PeekTok, diag::err_pp_expr_bad_token);
+    PP.Diag(PeekTok, diag::err_pp_expr_bad_token_binop);
     return true;
   }
   
@@ -392,7 +392,7 @@
 
     // If this token isn't valid, report the error.
     if (PeekPrec == ~0U) {
-      PP.Diag(PeekTok, diag::err_pp_expr_bad_token);
+      PP.Diag(PeekTok, diag::err_pp_expr_bad_token_binop);
       return true;
     }