Index: source/Commands/CommandObjectExpression.cpp
===================================================================
--- source/Commands/CommandObjectExpression.cpp
+++ source/Commands/CommandObjectExpression.cpp
@@ -300,15 +300,10 @@
         options.SetTryAllThreads(m_command_options.try_all_threads);
         options.SetDebug(m_command_options.debug);
         
-        // If the language was not specified in the expression command,
-        // set it to the language in the target's properties if
-        // specified, else default to the langage for the frame.
+        // If the language was specified in the expression command,
+        // use it to pick the right expression parser.
         if (m_command_options.language != eLanguageTypeUnknown)
             options.SetLanguage(m_command_options.language);
-        else if (target->GetLanguage() != eLanguageTypeUnknown)
-            options.SetLanguage(target->GetLanguage());
-        else if (frame)
-            options.SetLanguage(frame->GetLanguage());
 
         // If there is any chance we are going to stop and want to see
         // what went wrong with our expression, we should generate debug info
Index: source/Expression/UserExpression.cpp
===================================================================
--- source/Expression/UserExpression.cpp
+++ source/Expression/UserExpression.cpp
@@ -467,7 +467,7 @@
     Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP));
 
     lldb_private::ExecutionPolicy execution_policy = options.GetExecutionPolicy();
-    const lldb::LanguageType language = options.GetLanguage();
+    lldb::LanguageType language = options.GetLanguage();
     const ResultType desired_type = options.DoesCoerceToId() ? UserExpression::eResultTypeId : UserExpression::eResultTypeAny;
     lldb::ExpressionResults execution_results = lldb::eExpressionSetupError;
     
@@ -511,7 +511,19 @@
         full_prefix = expr_prefix;
     else
         full_prefix = option_prefix;
+    
+    // If the language was not specified in the expression command,
+    // set it to the language in the target's properties if
+    // specified, else default to the langage for the frame.
+    if (language == lldb::eLanguageTypeUnknown)
+    {
+        if (target->GetLanguage() != lldb::eLanguageTypeUnknown)
+            language = target->GetLanguage();
+        else if (StackFrame *frame = exe_ctx.GetFramePtr())
+            language = frame->GetLanguage();
+    }
 
+
     lldb::UserExpressionSP user_expression_sp(target->GetUserExpressionForLanguage (expr_cstr,
                                                                                     full_prefix,
                                                                                     language,