Index: lldb/source/Interpreter/CommandObject.cpp
===================================================================
--- lldb/source/Interpreter/CommandObject.cpp
+++ lldb/source/Interpreter/CommandObject.cpp
@@ -289,8 +289,10 @@
 
       bool handled_by_options = cur_options->HandleOptionCompletion(
           request, opt_element_vector, GetCommandInterpreter());
-      if (handled_by_options)
+      if (handled_by_options) {
+        m_exe_ctx.Clear();
         return;
+      }
     }
 
     // If we got here, the last word is not an option or an option argument.