diff --git a/gui/patternEditor.py b/gui/patternEditor.py
index f3b8da855..7a5bceb01 100644
--- a/gui/patternEditor.py
+++ b/gui/patternEditor.py
@@ -125,7 +125,7 @@ class DmgPatternEditorDlg (wx.Dialog):
             editObj.Bind(wx.EVT_TEXT, self.ValuesUpdated)
             editObj.SetLimited(True)
             editObj.SetMin(0)
-            editObj.SetMax(99999)
+            editObj.SetMax(2000000)
 
         contentSizer.Add(dmgeditSizer, 1, wx.EXPAND | wx.ALL, 5)
         self.slfooter = wx.StaticLine(self)
diff --git a/service/fit.py b/service/fit.py
index 25635b070..2da369576 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -742,7 +742,7 @@ class Fit(object):
 
         fit = eos.db.getFit(fitID)
         for attr in ("em", "thermal", "kinetic", "explosive"):
-            setattr(dp, "%sAmount" % attr, ammo.getAttribute("%sDamage" % attr))
+            setattr(dp, "%sAmount" % attr, ammo.getAttribute("%sDamage" % attr) or 0)
 
         fit.damagePattern = dp
         self.recalc(fit)