1 files changed, 4 insertions, 2 deletions
diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc
index 150887fb..f22320cb 100644
--- a/src/processor/minidump_processor.cc
+++ b/src/processor/minidump_processor.cc
@@ -169,8 +169,10 @@ ProcessResult MinidumpProcessor::Process(
         // of the thread's own context.  For the crashed thread, the thread's
         // own context is the state inside the exception handler.  Using it
         // would not result in the expected stack trace from the time of the
-        // crash.
-        context = exception->GetContext();
+        // crash. If the exception context is invalid, however, we fall back
+        // on the thread context.
+        MinidumpContext * ctx = exception->GetContext();
+        context = ctx ? ctx : thread->GetContext();
       }
     }