diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index d24f9a1956d..9f88162560b 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -120,7 +120,8 @@
 
 		move_inside()
 			set src in oview(1)
-			if (usr.stat != 0 || stat & (NOPOWER|BROKEN))
+			if (usr.stat == 2)
+				//Whoever had it so that a borg with a dead cell can't enter this thing should be shot. --NEO
 				return
 			if (!(istype(usr, /mob/living/silicon/)))
 				usr << "\blue <B>Only non-organics may enter the recharger!</B>"
@@ -128,6 +129,10 @@
 			if (src.occupant)
 				usr << "\blue <B>The cell is already occupied!</B>"
 				return
+			if (!usr:cell)
+				usr<<"\blue Without a powercell, you can't be recharged."
+				//Make sure they actually HAVE a cell, now that they can get in while powerless. --NEO
+				return
 			usr.pulling = null
 			usr.client.perspective = EYE_PERSPECTIVE
 			usr.client.eye = src