diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index 04505a376..62895a94e 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -210,6 +210,7 @@ GameEngine::GameEngine() : dictionary(nullptr) {
 
     context->InitGfxDebugger();
     context->InitFileDropMgr();
+    context->InitCrashHandler();
 
     this->context->InitAudio({ .SampleRate = 32000, .SampleLength = 512, .DesiredBuffered = 1100 });
 
@@ -411,6 +412,7 @@ void GameEngine::Create() {
 
 void GameEngine::Destroy() {
     GhostshipGui::Destroy();
+    gsFast3dWindow = nullptr;
     Instance->context = nullptr;
     AudioExit();
 #ifdef __SWITCH__