diff --git a/gui/additionsPane.py b/gui/additionsPane.py
index 9eb34111f..19cbf38a9 100644
--- a/gui/additionsPane.py
+++ b/gui/additionsPane.py
@@ -78,7 +78,7 @@ class AdditionsPane(TogglePanel):
         self.notebook.AddPage(self.projectedPage, "Projected", tabImage = projectedImg, showClose = False)
 
         self.gangPage = CommandView(self.notebook)
-        self.notebook.AddPage(self.gangPage, "Fleet", tabImage = gangImg, showClose = False)
+        self.notebook.AddPage(self.gangPage, "Command", tabImage = gangImg, showClose = False)
 
         self.notebook.SetSelection(0)
 
diff --git a/gui/commandView.py b/gui/commandView.py
index df00e42d7..5971e537c 100644
--- a/gui/commandView.py
+++ b/gui/commandView.py
@@ -182,6 +182,7 @@ class CommandView(d.Display):
         menu = None
         if sel != -1:
             item = self.get(sel)
+            if item is None: return
             sMkt = service.Market.getInstance()
             fitSrcContext = "commandFit"
             fitItemContext = item.name
diff --git a/gui/projectedView.py b/gui/projectedView.py
index 76b101293..f805ead1c 100644
--- a/gui/projectedView.py
+++ b/gui/projectedView.py
@@ -245,6 +245,7 @@ class ProjectedView(d.Display):
         menu = None
         if sel != -1:
             item = self.get(sel)
+            if item is None: return
             sMkt = service.Market.getInstance()
             if isinstance(item, eos.types.Drone):
                 srcContext = "projectedDrone"
diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index 95a752062..12596b04a 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -1553,11 +1553,11 @@ class FitItem(SFItem.SFBrowserItem):
         sFit = service.Fit.getInstance()
         fit = sFit.getFit(self.mainFrame.getActiveFit())
 
-        if fit and not fit.isStructure:
-            # If there is an active fit, get menu for setting individual boosters
-            menu.AppendSeparator()
-            boosterMenu = self.mainFrame.additionsPane.gangPage.buildBoostermenu()
-            menu.AppendSubMenu(boosterMenu, 'Set Booster')
+        # if fit and not fit.isStructure:
+        #     # If there is an active fit, get menu for setting individual boosters
+        #     menu.AppendSeparator()
+        #     boosterMenu = self.mainFrame.additionsPane.gangPage.buildBoostermenu()
+        #     menu.AppendSubMenu(boosterMenu, 'Set Booster')
 
         self.PopupMenu(menu, pos)