diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index 7f0c832..76ee983 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -2485,6 +2485,13 @@
                                       MultiExprArg Args) {
   if (!Receiver)
     return ExprError();
+
+  // A ParenListExpr can show up while doing error recovery with invalid code.
+  if (isa<ParenListExpr>(Receiver)) {
+    ExprResult Result = MaybeConvertParenListExprToParenExpr(S, Receiver);
+    if (Result.isInvalid()) return ExprError();
+    Receiver = Result.take();
+  }
   
   if (RespondsToSelectorSel.isNull()) {
     IdentifierInfo *SelectorId = &Context.Idents.get("respondsToSelector");
diff --git a/test/SemaObjC/message.m b/test/SemaObjC/message.m
index 621a18f..4015690 100644
--- a/test/SemaObjC/message.m
+++ b/test/SemaObjC/message.m
@@ -98,3 +98,11 @@
   [X rect]; // expected-warning {{receiver type 'struct objc_object *' is not 'id' or interface pointer, consider casting it to 'id'}} expected-warning {{method '-rect' not found (return type defaults to 'id')}}
 }
 
+// rdar://13207886
+void foo5(id p) {
+  p
+  [(id)(p) bar]; // expected-error {{missing '['}} \
+                 // expected-error {{expected ']'}} \
+                 // expected-note {{to match this '['}} \
+                 // expected-warning {{instance method '-bar' not found}}
+}