1 files changed, 3 insertions, 4 deletions

diff --git a/source/Target/ThreadPlanRunToAddress.cpp b/source/Target/ThreadPlanRunToAddress.cpp
index 54ae1dc22981c..18c43dafd7b37 100644
--- a/source/Target/ThreadPlanRunToAddress.cpp
+++ b/source/Target/ThreadPlanRunToAddress.cpp
@@ -7,12 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/Target/ThreadPlanRunToAddress.h"
-
 // C Includes
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
+#include "lldb/Target/ThreadPlanRunToAddress.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Stream.h"
 #include "lldb/Target/Target.h"
@@ -88,7 +87,7 @@ ThreadPlanRunToAddress::SetInitialBreakpoints ()
     {
         Breakpoint *breakpoint;
         breakpoint = m_thread.CalculateTarget()->CreateBreakpoint (m_addresses[i], true, false).get();
-        if (breakpoint != NULL)
+        if (breakpoint != nullptr)
         {
             m_break_ids[i] = breakpoint->GetID();
             breakpoint->SetThreadID(m_thread.GetID());
@@ -195,7 +194,7 @@ ThreadPlanRunToAddress::DoPlanExplainsStop (Event *event_ptr)
 bool
 ThreadPlanRunToAddress::ShouldStop (Event *event_ptr)
 {
-    return false;
+    return AtOurAddress();
 }
 
 bool