diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf
index 91165f7be5..1b9818ba82 100644
--- a/addons/weaponselect/XEH_postInit.sqf
+++ b/addons/weaponselect/XEH_postInit.sqf
@@ -7,13 +7,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectPistol), localize "STR_ACE_WeaponSelect_SelectPistol",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
     // Statement
     [ACE_player, handgunWeapon ACE_player] call FUNC(selectWeaponMode);
-    true
+    false
 },
 {false},
 [2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
@@ -21,13 +21,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectRifle), localize "STR_ACE_WeaponSelect_SelectRifle",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
     // Statement
     [ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMode);
-    true
+    false
 },
 {false},
 [3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
@@ -35,13 +35,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectRifleMuzzle), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
     // Statement
     [ACE_player, primaryWeapon ACE_player] call FUNC(selectWeaponMuzzle);
-    true
+    false
 },
 {false},
 [4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
@@ -49,13 +49,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectLauncher), localize "STR_ACE_WeaponSelect_SelectLauncher",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
     // Statement
     [ACE_player, secondaryWeapon ACE_player] call FUNC(selectWeaponMode);
-    true
+    false
 },
 {false},
 [5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
@@ -63,13 +63,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectBinocular), localize "STR_ACE_WeaponSelect_SelectBinocular",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
     // Statement
     [ACE_player, binocular ACE_player] call FUNC(selectWeaponMode);
-    true
+    false
 },
 {false},
 [6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
@@ -77,13 +77,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
     // Statement
     [ACE_player] call FUNC(selectGrenadeFrag);
-    true
+    false
 },
 {false},
 [7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key
@@ -91,13 +91,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
     // Statement
     [ACE_player] call FUNC(selectGrenadeOther);
-    true
+    false
 },
 {false},
 [8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key
@@ -105,13 +105,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !([ACE_player] call EFUNC(common,canUseWeapon)) exitWith {false};
 
     // Statement
     [ACE_player] call FUNC(putWeaponAway);
-    true
+    false
 },
 {false},
 [11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key
@@ -119,13 +119,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {!isEngineOn vehicle ACE_player}) exitWith {false};
 
     // Statement
     (vehicle ACE_player) engineOn true;
-    true
+    false
 },
 {false},
 [3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key
@@ -133,13 +133,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player && {ACE_player == driver vehicle ACE_player} && {isEngineOn vehicle ACE_player}) exitWith {false};
 
     // Statement
     (vehicle ACE_player) engineOn false;
-    true
+    false
 },
 {false},
 [2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key
@@ -147,13 +147,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectMainGun), localize "STR_ACE_WeaponSelect_SelectMainGun",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player) exitWith {false};
 
     // Statement
     [ACE_player, vehicle ACE_player, 0] call FUNC(selectWeaponVehicle);
-    true
+    false
 },
 {false},
 [4, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key
@@ -161,13 +161,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectMachineGun), localize "STR_ACE_WeaponSelect_SelectMachineGun",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player) exitWith {false};
 
     // Statement
     [ACE_player, vehicle ACE_player, 1] call FUNC(selectWeaponVehicle);
-    true
+    false
 },
 {false},
 [5, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key
@@ -175,13 +175,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(SelectMissiles), localize "STR_ACE_WeaponSelect_SelectMissiles",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player) exitWith {false};
 
     // Statement
     [ACE_player, vehicle ACE_player, 2] call FUNC(selectWeaponVehicle);
-    true
+    false
 },
 {false},
 [6, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key
@@ -189,13 +189,13 @@ if !(hasInterface) exitWith {};
 ["ACE3", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher",
 {
     // Conditions: canInteract
-    if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
+    if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if !(ACE_player != vehicle ACE_player && {ACE_player == commander vehicle ACE_player}) exitWith {false};
 
     // Statement
     [vehicle ACE_player] call FUNC(fireSmokeLauncher);
-    true
+    false
 },
 {false},
 [10, [false, false, false]], false] call cba_fnc_addKeybind; //9 Key