diff --git a/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp b/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp
index b956c83cb0..742e5b2acb 100644
--- a/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp
@@ -9,7 +9,7 @@
 
 #include <Alert.h>
 #include <Application.h>
-#include <Autolock.h>
+#include <AutoLocker.h>
 #include <Button.h>
 #include <ControlLook.h>
 #include <LayoutBuilder.h>
@@ -277,7 +277,7 @@ InspectorWindow::QuitRequested()
 void
 InspectorWindow::MemoryBlockRetrieved(TeamMemoryBlock* block)
 {
-	BAutolock lock(this);
+	AutoLocker<BLooper> lock(this);
 	if (lock.IsLocked()) {
 		fCurrentBlock = block;
 		fMemoryView->SetTargetAddress(block, fCurrentAddress);
@@ -290,6 +290,10 @@ InspectorWindow::MemoryBlockRetrieved(TeamMemoryBlock* block)
 status_t
 InspectorWindow::LoadSettings(const GUITeamUISettings* settings)
 {
+	AutoLocker<BLooper> lock(this);
+	if (!lock.IsLocked())
+		return B_ERROR;
+
 	BVariant value;
 	if (settings->Value("inspectorWindowFrame", value) == B_OK) {
 		BRect frameRect = value.ToRect();
@@ -308,6 +312,10 @@ InspectorWindow::LoadSettings(const GUITeamUISettings* settings)
 status_t
 InspectorWindow::SaveSettings(BMessage* settings)
 {
+	AutoLocker<BLooper> lock(this);
+	if (!lock.IsLocked())
+		return B_ERROR;
+
 	status_t error = settings->AddRect("inspectorWindowFrame", Frame());
 	if (error != B_OK)
 		return error;
diff --git a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
index 725296523f..1a72850d5c 100644
--- a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
@@ -335,13 +335,19 @@ TeamWindow::MessageReceived(BMessage* message)
 bool
 TeamWindow::QuitRequested()
 {
-	return fListener->UserInterfaceQuitRequested();
+	fListener->UserInterfaceQuitRequested();
+
+	return false;
 }
 
 
 status_t
 TeamWindow::LoadSettings(const GUITeamUISettings* settings)
 {
+	AutoLocker<BWindow> lock(this);
+	if (!lock.IsLocked())
+		return B_ERROR;
+
 	BVariant value;
 	status_t error = settings->Value("teamWindowFrame", value);
 	if (error == B_OK) {
@@ -364,6 +370,10 @@ TeamWindow::LoadSettings(const GUITeamUISettings* settings)
 status_t
 TeamWindow::SaveSettings(GUITeamUISettings* settings)
 {
+	AutoLocker<BWindow> lock(this);
+	if (!lock.IsLocked())
+		return B_ERROR;
+
 	// save the settings from the cached copy first,
 	// then overwrite them with our most current set
 	// this is necessary in order to preserve the settings