diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index ba4b9bdc790..6008b67dc08 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1150,7 +1150,8 @@
 		if(newname)
 			name = newname
 		else
-			alert(occupant, "nope.avi")
+			if(!newname || newname == "" || newname == " ")
+				alert(occupant, "nope.avi")
 		return
 	if (href_list["repair_int_control_lost"])
 		src.occupant_message("Recalibrating coordination system.")