diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index b1fad2538c..5c318112aa 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -72,7 +72,7 @@
 			if(EW.use_external_power)
 				to_chat(user, "<span class='notice'>\The [EW] has no recharge port.</span>")
 				return
-		else if(!G.get_cell())
+		if(!G.get_cell())
 			to_chat(user, "\The [G] does not have a battery installed.")
 			return
 
diff --git a/code/modules/modular_computers/computers/modular_computer/power.dm b/code/modules/modular_computers/computers/modular_computer/power.dm
index 48871619fa..b3746d55d4 100644
--- a/code/modules/modular_computers/computers/modular_computer/power.dm
+++ b/code/modules/modular_computers/computers/modular_computer/power.dm
@@ -16,6 +16,12 @@
 		return TRUE
 	return FALSE
 
+/obj/item/modular_computer/get_cell()
+	if(battery_module)
+		return battery_module.battery
+	else
+		..()
+
 // Tries to use power from APC, if present.
 /obj/item/modular_computer/proc/apc_power(var/power_usage = 0)
 	apc_powered = TRUE
diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm
index 3b7ea1164b..df16c5864f 100644
--- a/code/modules/modular_computers/hardware/battery_module.dm
+++ b/code/modules/modular_computers/hardware/battery_module.dm
@@ -76,4 +76,7 @@
 
 /obj/item/weapon/computer_hardware/battery_module/proc/charge_to_full()
 	if(battery)
-		battery.charge = battery.maxcharge
\ No newline at end of file
+		battery.charge = battery.maxcharge
+
+/obj/item/weapon/computer_hardware/battery_module/get_cell()
+	return battery
\ No newline at end of file