diff --git a/python_modules/dagit/dagit_tests/graphql/test_execute_pipeline.py b/python_modules/dagit/dagit_tests/graphql/test_execute_pipeline.py
index 89f16639f451..acb863b800fa 100644
--- a/python_modules/dagit/dagit_tests/graphql/test_execute_pipeline.py
+++ b/python_modules/dagit/dagit_tests/graphql/test_execute_pipeline.py
@@ -148,6 +148,13 @@ def test_subscription_query_error():
     )
 
     assert step_run_log_entry
+    # Confirm that it is the user stack
+
+    assert step_run_log_entry['message'] == 'Execution of throw_a_thing.transform failed'
+    assert step_run_log_entry['error']
+    assert isinstance(step_run_log_entry['error']['stack'], list)
+
+    assert 'bad programmer' in step_run_log_entry['error']['stack'][-1]
 
 
 def _get_step_run_log_entry(pipeline_run_logs, step_key, typename):
@@ -167,6 +174,12 @@ def _get_step_run_log_entry(pipeline_run_logs, step_key, typename):
                 message
                 step {key }
             }
+            ... on ExecutionStepFailureEvent {
+                error {
+                    message
+                    stack
+                }
+            }
         }
     }
 }
diff --git a/python_modules/dagster/dagster/core/execution_plan/simple_engine.py b/python_modules/dagster/dagster/core/execution_plan/simple_engine.py
index 8cd9fa1ce0ad..10946eafc845 100644
--- a/python_modules/dagster/dagster/core/execution_plan/simple_engine.py
+++ b/python_modules/dagster/dagster/core/execution_plan/simple_engine.py
@@ -131,7 +131,7 @@ def execute_step_in_memory(step_context, inputs, intermediates_manager):
     except DagsterError as dagster_error:
         step_context.log.error(str(dagster_error))
 
-        exc_info = (
+        user_facing_exc_info = (
             # pylint does not know original_exc_info exists is is_user_code_error is true
             # pylint: disable=no-member
             dagster_error.original_exc_info
@@ -140,15 +140,15 @@ def execute_step_in_memory(step_context, inputs, intermediates_manager):
         )
 
         if step_context.executor_config.throw_on_user_error:
-            six.reraise(*exc_info)
+            six.reraise(*user_facing_exc_info)
 
-        error_info = serializable_error_info_from_exc_info(exc_info)
+        error_info = serializable_error_info_from_exc_info(user_facing_exc_info)
 
         yield ExecutionStepEvent.step_failure_event(
             step_context=step_context,
             step_failure_data=StepFailureData(
                 error_message=error_info.message,
-                error_cls_name=exc_info[0].__name__,  # 0 is the exception type
+                error_cls_name=user_facing_exc_info[0].__name__,  # 0 is the exception type
                 stack=error_info.stack,
             ),
         )
@@ -221,12 +221,20 @@ def _execute_steps_core_loop(step_context, inputs, intermediates_manager):
 
         step_context.events.execution_plan_step_success(step.key, timer_result.millis)
 
-    except DagsterError as e:
+    except DagsterError as dagster_error:
         # The step compute_fn and output error checking both raise exceptions. Catch
         # and re-throw these to ensure that the step is always marked as failed.
-        step_context.events.execution_plan_step_failure(step.key, sys.exc_info())
-        stack_trace = get_formatted_stack_trace(e)
-        step_context.log.error(str(e), stack_trace=stack_trace)
+
+        user_facing_exc_info = (
+            # pylint does not know original_exc_info exists is is_user_code_error is true
+            # pylint: disable=no-member
+            dagster_error.original_exc_info
+            if dagster_error.is_user_code_error
+            else sys.exc_info()
+        )
+        step_context.events.execution_plan_step_failure(step.key, user_facing_exc_info)
+        stack_trace = get_formatted_stack_trace(dagster_error)
+        step_context.log.error(str(dagster_error), stack_trace=stack_trace)
         six.reraise(*sys.exc_info())