diff --git a/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf b/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf
index 40c6b527d39..6217d769dde 100644
--- a/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf
@@ -22,4 +22,4 @@ private _assemblyMode = [false, true, true, GVAR(defaultAssemblyMode)] select (_
 private _notCrewed = (crew _staticWeapon) isEqualTo [];
 private _deadCrew = !(alive (gunner _staticWeapon)); // need to eject body???
 
-_assemblyMode && {_notCrewed || _deadCrew}
+_assemblyMode && {alive _staticWeapon} && {_notCrewed || _deadCrew}
diff --git a/addons/csw/functions/fnc_assemble_deployWeapon.sqf b/addons/csw/functions/fnc_assemble_deployWeapon.sqf
index 772cad65d4c..88f999cf038 100644
--- a/addons/csw/functions/fnc_assemble_deployWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_deployWeapon.sqf
@@ -69,7 +69,8 @@
     private _codeCheck = {
         params ["_args"];
         _args params ["_tripod"];
-        !isNull _tripod;
+
+        alive _tripod
     };
 
     [TIME_PROGRESSBAR(_deployTime), [_tripod, _player, _assembledClassname, _carryWeaponClassname], _onFinish, _onFailure, localize LSTRING(AssembleCSW_progressBar), _codeCheck] call EFUNC(common,progressBar);
diff --git a/addons/csw/functions/fnc_assemble_pickupTripod.sqf b/addons/csw/functions/fnc_assemble_pickupTripod.sqf
index d85f9a3f831..6a3a0404ed5 100644
--- a/addons/csw/functions/fnc_assemble_pickupTripod.sqf
+++ b/addons/csw/functions/fnc_assemble_pickupTripod.sqf
@@ -37,7 +37,7 @@
         params ["_args"];
         _args params ["_tripod", "_player"];
 
-        !(isNull _tripod) && { (secondaryWeapon _player) isEqualTo "" }
+        (alive _tripod) && { (secondaryWeapon _player) isEqualTo "" }
 
     };