diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index b7e666fc1..a7d70ca39 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -2731,9 +2731,11 @@ void PClass::StaticShutdown ()
 
 	FAutoSegIterator probe(CRegHead, CRegTail);
 
-	while (*++probe != NULL)
+	while (*++probe != nullptr)
 	{
-		((ClassReg *)*probe)->MyClass = NULL;
+		auto cr = ((ClassReg *)*probe);
+		cr->MyClass = nullptr;
+		if (cr->VMExport != nullptr) cr->VMExport->MyClass = nullptr;
 	}
 
 }