diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index be42a4baaa4..375a4ae055c 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -77,7 +77,7 @@ AI MODULES
 			usr << "You haven't selected a cyborg to transmit laws to!"
 			return
 
-		if (comp.current.stat == 2)
+		if (comp.current.stat == 2 || comp.current.emagged)
 			usr << "Upload failed. No signal is being detected from the cyborg."
 		else if (comp.current.connected_ai)
 			usr << "Upload failed. The cyborg is slaved to an AI."
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index c81b8f68332..8c0fbc3b714 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -57,13 +57,9 @@
 		if("Security")
 			src.module = new /obj/item/weapon/robot_module/security(src)
 			src.hands.icon_state = "security"
-			var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Armored", "Robocop", "Robocop Red")
+			var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Armored")
 			if(icontype == "Armored")
 				src.icon_state = "Security"
-			else if(icontype == "Robocop")
-				src.icon_state = "Security2"
-			else if(icontype == "Robocop Red")
-				src.icon_state = "Security3"
 			else
 				src.icon_state = "robot"
 			src.modtype = "Sec"
@@ -417,6 +413,7 @@
 				emagged = 1
 				locked = 0
 				lawupdate = 0
+				connected_ai = null
 				user << "You emag [src]'s interface."
 				clear_supplied_laws()
 				clear_inherent_laws()