diff --git a/addons/explosives/functions/fnc_addCellphoneIED.sqf b/addons/explosives/functions/fnc_addCellphoneIED.sqf
index 49bec07f1b..84cb57cf4e 100644
--- a/addons/explosives/functions/fnc_addCellphoneIED.sqf
+++ b/addons/explosives/functions/fnc_addCellphoneIED.sqf
@@ -38,7 +38,7 @@ while {!_codeSet} do {
     _code = "0" + _code;
     _count = _count - 1;
   };
-  _codeSet = (isNull [objNull,_code] call FUNC(getSpeedDialExplosive));
+  _codeSet = (count ([_code] call FUNC(getSpeedDialExplosive))) == 0;
 };
 if (isNil QGVAR(CellphoneIEDs)) then {
   GVAR(CellphoneIEDs) = [];
diff --git a/addons/explosives/functions/fnc_dialPhone.sqf b/addons/explosives/functions/fnc_dialPhone.sqf
index 58d3dab716..41b2a4a4f7 100644
--- a/addons/explosives/functions/fnc_dialPhone.sqf
+++ b/addons/explosives/functions/fnc_dialPhone.sqf
@@ -31,10 +31,10 @@ if (_unit == ace_player) then {
 	[FUNC(dialingPhone), 0.25, [_unit,4,_arr,_code]] call CALLSTACK(CBA_fnc_addPerFrameHandler);
 } else {
 	private ["_explosive"];
-	_explosive = [_unit, _code] call FUNC(getSpeedDialExplosive);
-	if (!isNull (_explosive)) then {
+	_explosive = [_code] call FUNC(getSpeedDialExplosive);
+	if ((count _explosive) > 0) then {
 		[{
-			playSound3D [QUOTE(PATHTOF_R(Data\Audio\Cellphone_Ring.wss)),objNull, false, getPosASL (_this select 1),3.16228,1,75];
+			playSound3D [QUOTE(PATHTO_R(Data\Audio\Cellphone_Ring.wss)),objNull, false, getPosASL (_this select 1),3.16228,1,75];
 			(_this select 0) setVariable [QGVAR(Dialing), false, true];
 		}, [_unit,_explosive select 0], 0.25 * (count _arr - 4), 0] call EFUNC(common,waitAndExecute);
 		[_explosive select 0,(0.25 * (count _arr - 1)) + (_explosive select 2)] call FUNC(startTimer);
diff --git a/addons/explosives/functions/fnc_dialingPhone.sqf b/addons/explosives/functions/fnc_dialingPhone.sqf
index 003fd734c1..d3c429c9fc 100644
--- a/addons/explosives/functions/fnc_dialingPhone.sqf
+++ b/addons/explosives/functions/fnc_dialingPhone.sqf
@@ -19,16 +19,16 @@
 #include "script_component.hpp"
 EXPLODE_4_PVT(_this select 0,_unit,_i,_arr,_code);
 if ((_i mod 4) == 0) then {
-    playSound3D [QUOTE(PATHTOF_R(Data\Audio\DialTone.wss)), objNull, false, (_unit ModelToWorld [0,0.2,2]), 15,1,2.5];
+    playSound3D [QUOTE(PATHTO_R(Data\Audio\DialTone.wss)), objNull, false, (_unit ModelToWorld [0,0.2,2]), 15,1,2.5];
 };
 ctrlSetText [1400,format["Calling%1",_arr select (_i - 4)]];
 
 private "_explosive";
-_explosive = [_unit, _code] call FUNC(getSpeedDialExplosive);
+_explosive = [_code] call FUNC(getSpeedDialExplosive);
 
 if (_i >= (count _arr + 2)) then {
     [_this select 1] call CALLSTACK(cba_fnc_removePerFrameHandler);
-    if (!isNull (_explosive)) then {
+    if ((count _explosive) > 0) then {
         [_unit, -1, [_explosive select 0, _explosive select 2]] call FUNC(detonateExplosive);
     };
     _unit setVariable [QGVAR(Dialing), false, true];
@@ -37,8 +37,8 @@ if (_i >= (count _arr + 2)) then {
     };
 };
 if (_i == (count _arr)) then {
-    if (!isNull (_explosive)) then {
-        playSound3D [QUOTE(PATHTOF_R(Data\Audio\Cellphone_Ring.wss)),objNull, false, getPosASL (_explosive select 0),3.16228,1,75];
+    if ((count _explosive) > 0) then {
+        playSound3D [QUOTE(PATHTO_R(Data\Audio\Cellphone_Ring.wss)),objNull, false, getPosASL (_explosive select 0),3.16228,1,75];
     };
 };
 (_this select 0) set [1, _i + 1];
diff --git a/addons/explosives/functions/fnc_getSpeedDialExplosive.sqf b/addons/explosives/functions/fnc_getSpeedDialExplosive.sqf
index c00f15b5ed..d6d5b57b3b 100644
--- a/addons/explosives/functions/fnc_getSpeedDialExplosive.sqf
+++ b/addons/explosives/functions/fnc_getSpeedDialExplosive.sqf
@@ -1,24 +1,23 @@
 /*
  * Author: Garth 'L-H' de Wet
- * Gets the explosive object or objNull from the speed dial entry.
+ * Gets the explosive from the speed dial entry.
  *
  * Arguments:
- * 0: Unit <OBJECT>
- * 1: Speed dial entry <STRING>
+ * 0: Speed dial entry <STRING>
  *
  * Return Value:
  * Associated explosive (or ObjNull) <OBJECT>
  *
  * Example:
- * [ace_player, "2113"] call ace_explosives_fnc_getSpeedDialExplosive;
+ * ["2113"] call ace_explosives_fnc_getSpeedDialExplosive;
  *
  * Public: Yes
  */
 #include "script_component.hpp"
-EXPLODE_2_PVT(_this,_unit,_code);
+EXPLODE_1_PVT(_this,_code);
 private ["_explosive"];
-if (isNil QGVAR(CellphoneIEDs)) exitWith {objNull};
-_explosive = objNull;
+if (isNil QGVAR(CellphoneIEDs)) exitWith {[]};
+_explosive = [];
 {
   if ((_x select 1) == _code) exitWith {
     _explosive = _x;
diff --git a/addons/explosives/functions/fnc_place_Approve.sqf b/addons/explosives/functions/fnc_place_Approve.sqf
index 97528cb8f6..77cfbb92a1 100644
--- a/addons/explosives/functions/fnc_place_Approve.sqf
+++ b/addons/explosives/functions/fnc_place_Approve.sqf
@@ -28,79 +28,78 @@ _player = ACE_player;
 [_player, "DefaultAction", _player getVariable [QGVAR(Place), -1]] call EFUNC(Common,removeActionEventHandler);
 [_player, "MenuBack", _player getVariable [QGVAR(Cancel), -1]] call EFUNC(Common,removeActionEventHandler);
 call EFUNC(interaction,hideMouseHint);
-if ((_setup getVariable [QGVAR(Class), ""]) != "") then {
-	_dir = (getDir _setup);
-	if (_dir > 180) then {
-		_dir = _dir - 180;
-	} else {
-		_dir = 180 + _dir;
-	};
-	_setup setVariable [QGVAR(Direction), _dir];
-	_player setVariable [QGVAR(PlantingExplosive), true];
-	_setup addEventHandler ["EpeContactStart", {
-		if (!((_this select 0) getVariable [QGVAR(Handled), false])) then {
-			private ["_player", "_pos", "_attachTo"];
+if ((_setup getVariable [QGVAR(Class), ""]) == "") exitWith {
+	deleteVehicle _setup;
+};
+_dir = (getDir _setup);
+if (_dir > 180) then {
+	_dir = _dir - 180;
+} else {
+	_dir = 180 + _dir;
+};
+_setup setVariable [QGVAR(Direction), _dir];
+_player setVariable [QGVAR(PlantingExplosive), true];
+_setup addEventHandler ["EpeContactStart", {
+	if (!((_this select 0) getVariable [QGVAR(Handled), false])) then {
+		private ["_player", "_pos", "_attachTo"];
+		_player = ACE_player;
+		_player setVariable [QGVAR(PlantingExplosive), false];
+		_pos = getPosATL (_this select 0);
+		(_this select 0) enableSimulationGlobal false;
+		if (surfaceIsWater _pos) then {
+			_pos = getPosASL (_this select 0);
+			(_this select 0) setPosASL _pos;
+		}else{
+			(_this select 0) setPosATL _pos;
+		};
+		(_this select 0) setVariable [QGVAR(Handled), true];
+		_attachTo = objNull;
+		if (!isNull (_this select 1) && {(_this select 1) isKindOf "AllVehicles"}) then {
+			_attachTo = (_this select 1);
+		};
+		[(_this select 0),_attachTo, _pos] spawn { // TODO: Change to scheduled delay execution
+			private ["_mag", "_setup", "_dir", "_player"];
+			_setup = _this select 0;
 			_player = ACE_player;
-			_pos = getPosATL (_this select 0);
-			(_this select 0) enableSimulationGlobal false;
-			if (surfaceIsWater _pos) then {
-				_pos = getPosASL (_this select 0);
-				(_this select 0) setPosASL _pos;
-			}else{
-				(_this select 0) setPosATL _pos;
-			};
-			(_this select 0) setVariable [QGVAR(Handled), true];
-			_player setVariable [QGVAR(PlantingExplosive), false];
-			_attachTo = objNull;
-			if (!isNull (_this select 1) && {(_this select 1) isKindOf "AllVehicles"}) then {
-				_attachTo = (_this select 1);
-			};
-			[(_this select 0),_attachTo, _pos] spawn { // TODO: Change to scheduled delay execution
-				private ["_mag", "_setup", "_dir", "_player"];
-				_setup = _this select 0;
-				_player = ACE_player;
-				_mag = _setup getVariable [QGVAR(Class), ""];
-				_dir = _setup getVariable [QGVAR(Direction), 0];
+			_mag = _setup getVariable [QGVAR(Class), ""];
+			_dir = _setup getVariable [QGVAR(Direction), 0];
 
-				sleep getNumber(ConfigFile >> "CfgMagazines" >> _mag >> "ACE_DelayTime");
-				_explosive = [_player, _this select 2, _dir, _mag, _setup getVariable QGVAR(Trigger),
-				[_setup getVariable QGVAR(Timer)], isNull (_this select 1)] call FUNC(placeExplosive);
-				deleteVehicle _setup;
-				if (!isNull(_explosive)) then {
-					_player RemoveMagazine _mag;
-					if (!isNull (_this select 1)) then {
-						_explosive attachTo [(_this select 1)];
-						_dir = _dir - (getDir (_this select 1));
-						[[_explosive, _dir, 0], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc);
-					};
+			sleep getNumber(ConfigFile >> "CfgMagazines" >> _mag >> "ACE_DelayTime");
+			_explosive = [_player, _this select 2, _dir, _mag, _setup getVariable QGVAR(Trigger),
+			[_setup getVariable QGVAR(Timer)], isNull (_this select 1)] call FUNC(placeExplosive);
+			deleteVehicle _setup;
+			if (!isNull(_explosive)) then {
+				_player RemoveMagazine _mag;
+				if (!isNull (_this select 1)) then {
+					_explosive attachTo [(_this select 1)];
+					_dir = _dir - (getDir (_this select 1));
+					[[_explosive, _dir, 0], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc);
 				};
 			};
 		};
-	}];
-	_setup enableSimulationGlobal true;
-	_player playActionNow "MedicOther";
-	[_setup] spawn { // TODO: Change to scheduled delay execution
-		private ["_setup", "_player"];
-		_setup = _this select 0;
-		_player = ACE_player;
-		sleep 5;
+	};
+}];
+_setup enableSimulationGlobal true;
+_player playActionNow "MedicOther";
+[_setup] spawn { // TODO: Change to scheduled delay execution
+	private ["_setup", "_player"];
+	_setup = _this select 0;
+	_player = ACE_player;
+	sleep 5;
+	_player setVariable [QGVAR(PlantingExplosive), false];
+	if (!isNull _setup) then {
+		private ["_mag", "_dir", "_delayTime"];
+		_mag = _setup getVariable [QGVAR(Class), ""];
+		_dir = _setup getVariable [QGVAR(Direction), 0];
+		_delayTime = (getNumber(ConfigFile >> "CfgMagazines" >> _mag >> "ACE_DelayTime")) - 5;
+		if (_delayTime > 0) then {
+			sleep _delayTime;
+		};
 		if (!isNull _setup) then {
-			private ["_mag", "_dir", "_delayTime"];
-			_mag = _setup getVariable [QGVAR(Class), ""];
-			_dir = _setup getVariable [QGVAR(Direction), 0];
-			_delayTime = (getNumber(ConfigFile >> "CfgMagazines" >> _mag >> "ACE_DelayTime")) - 5;
-			if (_delayTime > 0) then {
-				sleep _delayTime;
-			};
-			if (!isNull _setup) then {
-				[_player, GetPosATL _setup, _dir, _mag, _setup getVariable QGVAR(Trigger),
-				[_setup getVariable QGVAR(Timer)], true] call FUNC(placeExplosive);
-				deleteVehicle _setup;
-				_player RemoveMagazine _mag;
-				_player setVariable [QGVAR(PlantingExplosive), false];
-			};
+			[_player, GetPosATL _setup, _dir, _mag, _setup getVariable QGVAR(Trigger),
+			[_setup getVariable QGVAR(Timer)], true] call FUNC(placeExplosive);
+			deleteVehicle _setup;
+			_player RemoveMagazine _mag;
 		};
 	};
-}else{
-	deleteVehicle _setup;
 };