ucrtbased.dll!00007ff98b731225()	Unknown
 	ucrtbased.dll!00007ff98b731043()	Unknown
 	ucrtbased.dll!00007ff98b73398f()	Unknown
 	python37_d.dll!00007ff98e398b45()	Unknown
 	python37_d.dll!00007ff98e358e73()	Unknown
 	python37_d.dll!00007ff98e3567a3()	Unknown
 	python37_d.dll!00007ff98e356a7f()	Unknown
 	python37_d.dll!00007ff98e359af8()	Unknown
>	blender.exe!parse_syntax_error(_object * err=0x000002cf98fece00, _object * * message=0x000000e0c87fea28, _object * * filename=0x000000e0c87fea48, int * lineno=0x000000e0c87feaf4, int * offset=0x000000e0c87feb14, _object * * text=0x000000e0c87fea68) Line 63	C
 	blender.exe!python_script_error_jump(const unsigned char * filepath=0x000002cf97bab9ea, int * lineno=0x000000e0c87feaf4, int * offset=0x000000e0c87feb14) Line 152	C
 	blender.exe!python_script_error_jump_text(Text * text=0x000002cf97bab9c8) Line 407	C
 	blender.exe!python_script_exec(bContext * C=0x000002cf81bac828, const unsigned char * fn=0x0000000000000000, Text * text=0x000002cf97bab9c8, ReportList * reports=0x000002cf9870b8d8, const bool do_jump=true) Line 470	C
 	blender.exe!BPY_execute_text(bContext * C=0x000002cf81bac828, Text * text=0x000002cf97bab9c8, ReportList * reports=0x000002cf9870b8d8, const bool do_jump=true) Line 570	C
 	blender.exe!text_run_script(bContext * C=0x000002cf81bac828, ReportList * reports=0x000002cf9870b8d8) Line 708	C
 	blender.exe!text_run_script_exec(bContext * C=0x000002cf81bac828, wmOperator * op=0x000002cf9ee4c768) Line 749	C
 	blender.exe!wm_operator_invoke(bContext * C=0x000002cf81bac828, wmOperatorType * ot=0x000002cf84b76078, wmEvent * event=0x000002cf8571c5a8, PointerRNA * properties=0x000000e0c87ff418, ReportList * reports=0x0000000000000000, const bool poll_only=false, bool use_last_properties=true) Line 1452	C
 	blender.exe!wm_operator_call_internal(bContext * C=0x000002cf81bac828, wmOperatorType * ot=0x000002cf84b76078, PointerRNA * properties=0x000000e0c87ff418, ReportList * reports=0x0000000000000000, const short context=1, const bool poll_only=false, wmEvent * event=0x000002cf8571c5a8) Line 1653	C
 	blender.exe!WM_operator_name_call_ptr(bContext * C=0x000002cf81bac828, wmOperatorType * ot=0x000002cf84b76078, short context=1, PointerRNA * properties=0x000000e0c87ff418) Line 1702	C
 	blender.exe!ui_apply_but_funcs_after(bContext * C=0x000002cf81bac828) Line 809	C
 	blender.exe!ui_handler_region_menu(bContext * C=0x000002cf81bac828, const wmEvent * event=0x000002cfa17cf518, void * UNUSED_userdata=0x000002cf985e1cc8) Line 10148	C
 	blender.exe!wm_handler_ui_call(bContext * C=0x000002cf81bac828, wmEventHandler_UI * handler=0x000002cfa0a0e4d8, const wmEvent * event=0x000002cfa17cf518, int always_pass=0) Line 623	C
 	blender.exe!wm_handlers_do_intern(bContext * C=0x000002cf81bac828, wmEvent * event=0x000002cfa17cf518, ListBase * handlers=0x000002cf84c4c198) Line 2701	C
 	blender.exe!wm_handlers_do(bContext * C=0x000002cf81bac828, wmEvent * event=0x000002cfa17cf518, ListBase * handlers=0x000002cf84c4c198) Line 2944	C
 	blender.exe!wm_event_do_handlers(bContext * C=0x000002cf81bac828) Line 3313	C
 	blender.exe!WM_main(bContext * C=0x000002cf81bac828) Line 420	C
 	blender.exe!main(int argc=1, const unsigned char * * UNUSED_argv_c=0x000002cf81ac5c80) Line 502	C
 	[External Code]

/* We may end up clearing live exceptions below, so make sure it's ours. */
assert(!PyErr_Occurred());

res = find_name_in_mro(type, name, &error);
/* Only put NULL results into cache if there was no error. */
if (error) {
    /* It's not ideal to clear the error condition,
       but this function is documented as not setting
       an exception, and I don't want to change that.
       E.g., when PyType_Ready() can't proceed, it won't
       set the "ready" flag, so future attempts to ready
       the same type will call it again -- hopefully
       in a context that propagates the exception out.
    */
    if (error == -1) {
        PyErr_Clear();
    }
    return NULL;
}

diff --git a/source/blender/python/intern/bpy_traceback.c b/source/blender/python/intern/bpy_traceback.c
index c9c9e4adafb..382da69aaca 100644
--- a/source/blender/python/intern/bpy_traceback.c
+++ b/source/blender/python/intern/bpy_traceback.c
@@ -143,7 +143,6 @@ void python_script_error_jump(const char *filepath, int *lineno, int *offset)
     /* no traceback available when SyntaxError.
      * python has no api's to this. reference parse_syntax_error() from pythonrun.c */
     PyErr_NormalizeException(&exception, &value, (PyObject **)&tb);
-    PyErr_Restore(exception, value, (PyObject *)tb); /* takes away reference! */

     if (value) { /* should always be true */
       PyObject *message;
@@ -165,6 +164,8 @@ void python_script_error_jump(const char *filepath, int *lineno, int *offset)
         *lineno = -1;
       }
     }
+
+    PyErr_Restore(exception, value, (PyObject *)tb); /* takes away reference! */
   }
   else {
     PyErr_NormalizeException(&exception, &value, (PyObject **)&tb);