diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index abe46b38a5ae..a4a904ee8025 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -195,7 +195,10 @@
 				var/new_name = html_encode(params["name"])
 				if(!new_name || ..())
 					return
-				A.AssignName(new_name)
+				if(length(new_name) < MAX_NAME_LEN)
+					A.AssignName(new_name)
+				else
+					to_chat(usr, span_warning("That name is too long!"))
 				. = TRUE
 		if("create_culture_bottle")
 			if (wait)