diff --git a/controller/fit.py b/controller/fit.py
index 13c18edcf..5d8f49a8f 100644
--- a/controller/fit.py
+++ b/controller/fit.py
@@ -65,6 +65,9 @@ class Fit(object):
         return newFit.ID
 
     def getFit(self, fitID):
+        if fitID is None:
+            return None
+
         fit = eos.db.getFit(fitID)
         fit.fill()
         return fit
diff --git a/eos b/eos
index c9a60088e..8498a5242 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit c9a60088e7babab3854e4179decd1123f3a3cd87
+Subproject commit 8498a524268228301d6b043b1c8b6f8f531783dc
diff --git a/gui/fittingView.py b/gui/fittingView.py
index 64bfd9521..0837852b1 100644
--- a/gui/fittingView.py
+++ b/gui/fittingView.py
@@ -134,12 +134,13 @@ class FittingView(wx.ListCtrl):
         modSlotMap = {}
         slotOrder = [Slot.SUBSYSTEM, Slot.HIGH, Slot.MED, Slot.LOW, Slot.RIG]
 
-        for modid, mod in enumerate(fit.modules):
-            index = self.InsertStringItem(sys.maxint, "")
-            for i, col in enumerate(self.activeColumns):
-                self.SetStringItem(index, i, col.getText(mod), col.getImageId(mod))
-                self.SetItemData(index, modid)
-                modSlotMap[modid] = mod.slot
+        if fit is not None:
+            for modid, mod in enumerate(fit.modules):
+                index = self.InsertStringItem(sys.maxint, "")
+                for i, col in enumerate(self.activeColumns):
+                    self.SetStringItem(index, i, col.getText(mod), col.getImageId(mod))
+                    self.SetItemData(index, modid)
+                    modSlotMap[modid] = mod.slot
 
         for i, col in enumerate(self.activeColumns):
             if not col.resized: