diff --git a/clang/lib/Analysis/CFRefCount.cpp b/clang/lib/Analysis/CFRefCount.cpp
index faf783941841..652b65f6488a 100644
--- a/clang/lib/Analysis/CFRefCount.cpp
+++ b/clang/lib/Analysis/CFRefCount.cpp
@@ -2707,8 +2707,8 @@ CFRefLeakReport::getEndPath(BugReporter& br, const ExplodedNode<GRState>* EndN){
       // FIXME: What we really want is to set LeakN to be the node
       // for the BlockEntrance for the branch we took and have BugReporter
       // do the right thing.
-      atBranch = true;
       S = BE->getSrc()->getTerminator();
+      atBranch = (S != 0);
     }
     
     if (S) {