diff --git a/src/apps/debugger/controllers/TeamDebugger.cpp b/src/apps/debugger/controllers/TeamDebugger.cpp
index 6c8f43ecd2..a84a3205ad 100644
--- a/src/apps/debugger/controllers/TeamDebugger.cpp
+++ b/src/apps/debugger/controllers/TeamDebugger.cpp
@@ -277,13 +277,17 @@ TeamDebugger::~TeamDebugger()
 			thread = next;
 		}
 	}
+
+	if (fReportGenerator != NULL) {
+		fReportGenerator->Lock();
+		fReportGenerator->Quit();
+	}
+
 	delete fImageInfoPendingThreads;
 
 	delete fBreakpointManager;
 	delete fWatchpointManager;
 	delete fMemoryBlockManager;
-	fReportGenerator->Lock();
-	fReportGenerator->Quit();
 	delete fWorker;
 	delete fTeam;
 	delete fFileManager;