diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 1de90c0f1c0..77b26a3c3dd 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -85,11 +85,6 @@
 				W.afterattack(A, src, 0, params)
 				return
 
-//Middle click cycles through selected modules.
-/mob/living/silicon/robot/MiddleClickOn(atom/A)
-	. = ..()
-	cycle_modules()
-
 //Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks
 // for non-doors/apcs
 /mob/living/silicon/robot/CtrlShiftClickOn(atom/A)
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index bc4a13b95d4..3e59b227521 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -313,7 +313,7 @@
   * * module_num - the slot number being selected
   */
 /mob/living/silicon/robot/proc/select_module(module_num)
-	if(!held_items[module_num])
+	if(is_invalid_module_number(module_num) || !held_items[module_num]) //If the slot number is invalid, or there's nothing there, we have nothing to equip
 		return FALSE
 
 	switch(module_num)