diff --git a/lldb/include/lldb/Breakpoint/BreakpointSite.h b/lldb/include/lldb/Breakpoint/BreakpointSite.h
index d67fc8bb57f1..59bc54d973cd 100644
--- a/lldb/include/lldb/Breakpoint/BreakpointSite.h
+++ b/lldb/include/lldb/Breakpoint/BreakpointSite.h
@@ -186,6 +186,20 @@ public:
     lldb::BreakpointLocationSP
     GetOwnerAtIndex (size_t idx);
     
+    //------------------------------------------------------------------
+    /// This method copies the breakpoint site's owners into a new collection.
+    /// It does this while the owners mutex is locked.
+    ///
+    /// @param[out] out_collection
+    ///    The BreakpointLocationCollection into which to put the owners
+    ///    of this breakpoint site.
+    ///
+    /// @return
+    ///    The number of elements copied into out_collection.
+    //------------------------------------------------------------------
+    size_t
+    CopyOwnersList (BreakpointLocationCollection &out_collection);
+    
     //------------------------------------------------------------------
     /// Check whether the owners of this breakpoint site have any
     /// thread specifiers, and if yes, is \a thread contained in any
diff --git a/lldb/source/Breakpoint/BreakpointSite.cpp b/lldb/source/Breakpoint/BreakpointSite.cpp
index 95b67b03c7b3..27e56d3fb9a6 100644
--- a/lldb/source/Breakpoint/BreakpointSite.cpp
+++ b/lldb/source/Breakpoint/BreakpointSite.cpp
@@ -254,3 +254,14 @@ BreakpointSite::IntersectsRange(lldb::addr_t addr, size_t size, lldb::addr_t *in
     }
     return false;
 }
+
+size_t
+BreakpointSite::CopyOwnersList (BreakpointLocationCollection &out_collection)
+{
+    Mutex::Locker locker(m_owners_mutex);
+    for (BreakpointLocationSP loc_sp : m_owners.BreakpointLocations())
+    {
+        out_collection.Add(loc_sp);
+    }
+    return out_collection.GetSize();
+}
diff --git a/lldb/source/Target/StopInfo.cpp b/lldb/source/Target/StopInfo.cpp
index 4f6ef7a92949..64bbe80ee2b1 100644
--- a/lldb/source/Target/StopInfo.cpp
+++ b/lldb/source/Target/StopInfo.cpp
@@ -350,7 +350,10 @@ protected:
 
             if (bp_site_sp)
             {
-                size_t num_owners = bp_site_sp->GetNumberOfOwners();
+                // Let's copy the owners list out of the site and store them in a local list.  That way if
+                // one of the breakpoint actions changes the site, then we won't be operating on a bad list.
+                BreakpointLocationCollection site_locations;
+                size_t num_owners = bp_site_sp->CopyOwnersList(site_locations);
 
                 if (num_owners == 0)
                 {
@@ -416,20 +419,16 @@ protected:
 
                     StoppointCallbackContext context (event_ptr, exe_ctx, false);
 
-                    // Let's copy the breakpoint locations out of the site and store them in a local list.  That way if
-                    // one of the breakpoint actions changes the site, then we won't be operating on a bad list.
                     // For safety's sake let's also grab an extra reference to the breakpoint owners of the locations we're
                     // going to examine, since the locations are going to have to get back to their breakpoints, and the
                     // locations don't keep their owners alive.  I'm just sticking the BreakpointSP's in a vector since
-                    // I'm only really using it to locally increment their retain counts.
+                    // I'm only using it to locally increment their retain counts.
 
-                    BreakpointLocationCollection site_locations;
                     std::vector<lldb::BreakpointSP> location_owners;
 
                     for (size_t j = 0; j < num_owners; j++)
                     {
-                        BreakpointLocationSP loc(bp_site_sp->GetOwnerAtIndex(j));
-                        site_locations.Add(loc);
+                        BreakpointLocationSP loc(site_locations.GetByIndex(j));
                         location_owners.push_back(loc->GetBreakpoint().shared_from_this());
 
                     }