diff --git a/src/apps/debugger/Debugger.cpp b/src/apps/debugger/Debugger.cpp
index 5c9c74f29e..2bd119ba52 100644
--- a/src/apps/debugger/Debugger.cpp
+++ b/src/apps/debugger/Debugger.cpp
@@ -247,7 +247,7 @@ Debugger::MessageReceived(BMessage* message)
 				fTeamsWindow = TeamsWindow::Create(&fSettingsManager);
 				if (fTeamsWindow != NULL)
 					fTeamsWindow->Show();
-           	} catch(...) {
+           	} catch (...) {
 				// TODO: Notify the user!
 				fprintf(stderr, "Error: Failed to create Teams window\n");
            	}
diff --git a/src/apps/debugger/user_interface/gui/teams_window/TeamsListView.cpp b/src/apps/debugger/user_interface/gui/teams_window/TeamsListView.cpp
index 6484724d03..b0345f21c5 100644
--- a/src/apps/debugger/user_interface/gui/teams_window/TeamsListView.cpp
+++ b/src/apps/debugger/user_interface/gui/teams_window/TeamsListView.cpp
@@ -3,6 +3,7 @@
  * Distributed under the terms of the MIT License.
  */
 
+
 #include <new>
 
 #include <stdio.h>
@@ -245,7 +246,7 @@ TeamsListView::MessageReceived(BMessage* message)
 
 			TeamListItem* item = new(std::nothrow) TeamListItem(team);
 			if (item != NULL) {
-				AddItem(new TeamListItem(team));
+				AddItem(item);
 				SortItems(&TeamListItem::Compare);
 			}
 			break;
diff --git a/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp b/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp
index 5796936bad..74b32ca86d 100644
--- a/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp
+++ b/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp
@@ -3,6 +3,7 @@
  * Distributed under the terms of the MIT License.
  */
 
+
 #include <new>
 
 #include <stdio.h>
@@ -44,7 +45,7 @@ TeamsWindow::Create(SettingsManager* settingsManager)
 
 	try {
 		self->_Init();
-	} catch(...) {
+	} catch (...) {
 		delete self;
 		throw;
 	}