diff --git a/source/Commands/CommandObjectBreakpointCommand.cpp b/source/Commands/CommandObjectBreakpointCommand.cpp
index 7283e6d..a7e98ea 100644
--- a/source/Commands/CommandObjectBreakpointCommand.cpp
+++ b/source/Commands/CommandObjectBreakpointCommand.cpp
@@ -799,7 +799,8 @@
     
     if (commands.GetSize() > 0)
     {
-        Target *target = context->exe_ctx.GetTargetPtr();
+        ExecutionContext exe_ctx (context->exe_ctx_ref);
+        Target *target = exe_ctx.GetTargetPtr();
         if (target)
         {
             CommandReturnObject result;
@@ -817,7 +818,7 @@
             bool print_results    = true;
 
             debugger.GetCommandInterpreter().HandleCommands (commands, 
-                                                             &(context->exe_ctx),
+                                                             &exe_ctx,
                                                              stop_on_continue, 
                                                              data->stop_on_error, 
                                                              echo_commands,