diff --git a/service/fit.py b/service/fit.py
index 57e6e92b4..3533ec4f3 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -248,10 +248,9 @@ class Fit(object):
         ammo = eos.db.getItem(ammoID)
 
         for pos in modules:
-            try:
+            mod = fit.modules[pos]
+            if mod.isValidCharge(ammo):
                 fit.modules[pos].charge = ammo
-            except:
-                pass
 
         fit.clear()
-        fit.calculateModifiedAttributes()
\ No newline at end of file
+        fit.calculateModifiedAttributes()