diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 7fd41e887a8..a3787379cef 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -783,6 +783,8 @@
 			to_chat(usr, "The borg must choose a module before he can be upgraded!")
 		else if(U.locked)
 			to_chat(usr, "The upgrade is locked and cannot be used yet!")
+		else if(cell)
+			to_chat(usr, "Remove the power cell first.")
 		else
 			if(U.action(src))
 				to_chat(usr, "You apply the upgrade to [src]!")