50c50
< stopEvent(this, false, StopPriority), _throwToScMain(nullptr),
---
> stopEvent(this, false, StopPriority), _throwUp(nullptr),
183c183
< throwToScMain();
---
> throwUp();
330c330
< throwToScMain();
---
> throwUp();
343c343
< throwToScMain();
---
> throwUp();
401,403c401,403
< if (_throwToScMain) {
< const ::sc_core::sc_report *to_throw = _throwToScMain;
< _throwToScMain = nullptr;
---
> if (_throwUp) {
> const ::sc_core::sc_report *to_throw = _throwUp;
> _throwUp = nullptr;
426c426
< Scheduler::throwToScMain()
---
> Scheduler::throwUp()
428,431c428,436
< ::sc_core::sc_report report = reportifyException();
< _throwToScMain = &report;
< status(StatusOther);
< scMainFiber.run();
---
> if (scMainFiber.called() && !scMainFiber.finished()) {
> ::sc_core::sc_report report = reportifyException();
> _throwUp = &report;
> status(StatusOther);
> scMainFiber.run();
> } else {
> reportHandlerProc(reportifyException(),
> ::sc_core::sc_report_handler::get_catch_actions());
> }