1 files changed, 8 insertions, 2 deletions

diff --git a/py/vm.c b/py/vm.c
index 22243c403e..98d1250720 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -604,8 +604,14 @@ unwind_return:
 
                     case MP_BC_RAISE_VARARGS:
                         unum = *ip++;
-                        assert(unum == 1);
-                        obj1 = POP();
+                        assert(unum <= 1);
+                        if (unum == 0) {
+                            // This assumes that nlr.ret_val holds last raised
+                            // exception and is not overwritten since then.
+                            obj1 = nlr.ret_val;
+                        } else {
+                            obj1 = POP();
+                        }
                         nlr_jump(rt_make_raise_obj(obj1));
 
                     case MP_BC_YIELD_VALUE: