diff --git a/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
index 2f95709e03b204f854305826eeb508e9856e9e28..69b331c16cc94d987b36b29fd794eff29f999a61 100644
--- a/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
@@ -310,9 +310,9 @@ void CallAndMessageChecker::emitNilReceiverBug(CheckerContext &C,
   os << "' that will be garbage";
 
   BugReport *report = new BugReport(*BT_msg_ret, os.str(), N);
+  report->addRange(msg.getReceiverSourceRange());
   // FIXME: This won't track "self" in messages to super.
   if (const Expr *receiver = msg.getInstanceReceiverExpr()) {
-    report->addRange(receiver->getSourceRange());
     report->addVisitor(bugreporter::getTrackNullOrUndefValueVisitor(N,
                                                                     receiver,
                                                                     report));