diff --git a/qrenderdoc/3rdparty/swig/Lib/python/pyrun.swg b/qrenderdoc/3rdparty/swig/Lib/python/pyrun.swg
index e960b3ae6..5b6c158b2 100644
--- a/qrenderdoc/3rdparty/swig/Lib/python/pyrun.swg
+++ b/qrenderdoc/3rdparty/swig/Lib/python/pyrun.swg
@@ -479,6 +479,9 @@ SWIGRUNTIME PyObject*
 SwigPyObject_richcompare(SwigPyObject *v, SwigPyObject *w, int op)
 {
   PyObject* res;
+  if( PyErr_Occurred() ) {
+    return NULL;
+  }
   if( op != Py_EQ && op != Py_NE ) {
     Py_INCREF(Py_NotImplemented);
     return Py_NotImplemented;
diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt
index 4a641cfc6..4f503e4b5 100644
--- a/qrenderdoc/CMakeLists.txt
+++ b/qrenderdoc/CMakeLists.txt
@@ -2,7 +2,7 @@ option(STATIC_QRENDERDOC "Compile qrenderdoc as static" OFF)
 option(QRENDERDOC_NO_CXX11_REGEX "Disable C++11 regex in scintilla" OFF)
 
 set(QMAKE_QT5_COMMAND qmake CACHE STRING "Command to run to invoke Qt5's qmake. Normally this is qmake, possibly with qtchooser, but might be qmake-qt5")
-set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-modified-5.zip CACHE STRING "The location where RenderDoc's swig fork source can be found. By default points to the URL on github but can be pointed to a local file.")
+set(RENDERDOC_SWIG_PACKAGE https://github.com/baldurk/swig/archive/renderdoc-modified-6.zip CACHE STRING "The location where RenderDoc's swig fork source can be found. By default points to the URL on github but can be pointed to a local file.")
 
 set(QMAKE_CONFIG "debug")
 set(QMAKE_LDFLAGS "")