diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 9eb981b981f..2ef6161fa7a 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -340,6 +340,7 @@
 	desc = "An implant commonly installed inside IPCs in order to allow them to easily collect energy from their environment"
 	origin_tech = "materials=3;biotech=2;powerstorage=3"
 	contents = newlist(/obj/item/apc_powercord)
+	requires_robotic_bodypart = TRUE
 
 /obj/item/organ/internal/cyberimp/arm/power_cord/emp_act(severity)
 	// To allow repair via nanopaste/screwdriver
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index 8c4b7258232..7acdb7a461c 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -111,6 +111,7 @@
 	slot = "heart"
 	vital = TRUE
 	status = ORGAN_ROBOT
+	requires_robotic_bodypart = TRUE
 
 /obj/item/organ/internal/eyes/optical_sensor
 	name = "optical sensor"
@@ -119,6 +120,7 @@
 	status = ORGAN_ROBOT
 //	dead_icon = "camera_broken"
 	weld_proof = TRUE
+	requires_robotic_bodypart = TRUE
 
 /obj/item/organ/internal/eyes/optical_sensor/remove(mob/living/user,special = 0)
 	if(!special)
@@ -152,6 +154,7 @@
 	icon_state = "taperecorder_idle"
 	status = ORGAN_ROBOT
 	dead_icon = "taperecorder_empty"
+	requires_robotic_bodypart = TRUE
 
 /obj/item/organ/internal/ears/microphone/remove(mob/living/user, special = FALSE)
 	if(!special)
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 26c346704eb..71b7b5b240d 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -394,7 +394,7 @@
 		return SURGERY_BEGINSTEP_SKIP
 
 	if(I.requires_robotic_bodypart)
-		to_chat(user, "<span class='warning'>[I] is an organ that requires a robotic interface[target].</span>")
+		to_chat(user, "<span class='warning'>[I] is an organ that requires a robotic interface! [target]'s [parse_zone(target_zone)] does not have one.</span>")
 		return SURGERY_BEGINSTEP_SKIP
 
 	if(target_zone != I.parent_organ || target.get_organ_slot(I.slot))