diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 0bcae47c5198b0644f5d1ac18e6c284fd6a6d697..dcecbc7a7da2a334d9fd16542135c5ce17532c65 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -317,7 +317,12 @@ ClangUserExpression::Parse (Stream &error_stream,
     }
     
     Process *process = exe_ctx.GetProcessPtr();
-    ClangExpressionParser parser(process, *this);
+    ExecutionContextScope *exe_scope = process;
+    
+    if (!exe_scope)
+        exe_scope = exe_ctx.GetTargetPtr();
+    
+    ClangExpressionParser parser(exe_scope, *this);
     
     unsigned num_errors = parser.Parse (error_stream);