diff --git a/eos/graph/fitDps.py b/eos/graph/fitDps.py
index 58102f2b2..6aead3583 100644
--- a/eos/graph/fitDps.py
+++ b/eos/graph/fitDps.py
@@ -81,7 +81,7 @@ class FitDpsGraph(Graph):
                     total += dps * self.calculateTurretMultiplier(mod, data)
 
             elif mod.hardpoint == Hardpoint.MISSILE:
-                if mod.state >= State.ACTIVE and mod.maxRange >= distance:
+                if mod.state >= State.ACTIVE and mod.maxRange is not None and mod.maxRange >= distance:
                     total += dps * self.calculateMissileMultiplier(mod, data)
 
         if distance <= fit.extraAttributes["droneControlRange"]:
diff --git a/gui/graphFrame.py b/gui/graphFrame.py
index 8d7149a6b..28bd14750 100644
--- a/gui/graphFrame.py
+++ b/gui/graphFrame.py
@@ -250,7 +250,7 @@ class GraphFrame(wx.Frame):
 
                 self.subplot.plot(x, y)
                 legend.append(fit.name)
-            except:
+            except Exception as ex:
                 pyfalog.warning("Invalid values in '{0}'", fit.name)
                 self.SetStatusText("Invalid values in '%s'" % fit.name)
                 self.canvas.draw()