diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
index 2bd510158..ba4684375 100644
--- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
@@ -944,6 +944,9 @@ QWidget *PythonContext::QWidgetFromPy(PyObject *widget)
   if(!initialised())
     return NULL;
 
+  if(widget == Py_None || widget == NULL)
+    return NULL;
+
   if(!SbkPySide2_QtCoreTypes || !SbkPySide2_QtGuiTypes || !SbkPySide2_QtWidgetsTypes)
     return UnwrapBareQWidget(widget);
 
@@ -1042,6 +1045,11 @@ PyObject *PythonContext::QtObjectToPython(const char *typeName, QObject *object)
     Py_RETURN_NONE;
   }
 
+  if(object == NULL)
+  {
+    Py_RETURN_NONE;
+  }
+
   PyObject *obj =
       Shiboken::Object::newObject(reinterpret_cast<SbkObjectType *>(Shiboken::SbkType<QObject>()),
                                   object, false, false, typeName);