1 files changed, 16 insertions, 1 deletions
diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp
index 7d1af333d84..57dd7c70bb3 100644
--- a/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/lldb/source/Commands/CommandObjectExpression.cpp
@@ -335,7 +335,22 @@ CommandObjectExpression::EvaluateExpression
             }
             else
             {
-                error_stream->PutCString(result_valobj_sp->GetError().AsCString());
+                const char *error_cstr = result_valobj_sp->GetError().AsCString();
+                if (error_cstr && error_cstr[0])
+                {
+                    int error_cstr_len = strlen (error_cstr);
+                    const bool ends_with_newline = error_cstr[error_cstr_len - 1] == '\n';
+                    if (strstr(error_cstr, "error:") != error_cstr)
+                        error_stream->PutCString ("error: ");
+                    error_stream->Write(error_cstr, error_cstr_len);
+                    if (!ends_with_newline)
+                        error_stream->EOL();
+                }
+                else
+                {
+                    error_stream->PutCString ("error: unknown error\n");
+                }
+
                 if (result)
                     result->SetStatus (eReturnStatusFailed);
             }