diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index e768bf216..4a7cf8371 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -1016,6 +1016,16 @@ class Fit(object):
     def getNumSlots(self, type):
         return self.ship.getModifiedItemAttr(self.slots[type]) or 0
 
+    def getHardpointsFree(self, type):
+        if type == Hardpoint.NONE:
+            return 1
+        elif type == Hardpoint.TURRET:
+            return self.ship.getModifiedItemAttr('turretSlotsLeft') - self.getHardpointsUsed(Hardpoint.TURRET)
+        elif type == Hardpoint.MISSILE:
+            return self.ship.getModifiedItemAttr('launcherSlotsLeft') - self.getHardpointsUsed(Hardpoint.MISSILE)
+        else:
+            raise ValueError("%d is not a valid value for Hardpoint Enum", type)
+            
     @property
     def calibrationUsed(self):
         return self.getItemAttrOnlineSum(self.modules, 'upgradeCost')
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 41bed8c50..4fce1cfb9 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -480,12 +480,8 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
 
         # Check this only if we're told to do so
         if hardpointLimit:
-            if self.hardpoint == Hardpoint.TURRET:
-                if fit.ship.getModifiedItemAttr('turretSlotsLeft') - fit.getHardpointsUsed(Hardpoint.TURRET) < 1:
-                    return False
-            elif self.hardpoint == Hardpoint.MISSILE:
-                if fit.ship.getModifiedItemAttr('launcherSlotsLeft') - fit.getHardpointsUsed(Hardpoint.MISSILE) < 1:
-                    return False
+            if fit.getHardpointsFree(self.hardpoint) < 1:
+                return False
 
         return True