diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py
index 95819a434..7570b2aa5 100644
--- a/gui/shipBrowser.py
+++ b/gui/shipBrowser.py
@@ -2006,9 +2006,10 @@ class FitItem(SFItem.SFBrowserItem):
         if activeFit == self.fitID and not self.deleted:
             sFit = Fit.getInstance()
             fit = sFit.getFit(activeFit)
-            self.timestamp = fit.modifiedCoalesce
-            self.notes = fit.notes
-            self.__setToolTip()
+            if fit is not None:  # sometimes happens when deleting fits, dunno why.
+                self.timestamp = fit.modifiedCoalesce
+                self.notes = fit.notes
+                self.__setToolTip()
 
         SFItem.SFBrowserItem.Refresh(self)
 
diff --git a/service/fit.py b/service/fit.py
index a905c7767..9c66e1f9a 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -257,6 +257,9 @@ class Fit(object):
             return None
         fit = eos.db.getFit(fitID)
 
+        if fit is None:
+            return None
+
         if basic:
             return fit