diff --git a/code/game/objects/structures/barricades.dm b/code/game/objects/structures/barricades.dm
index 1b1dee9171e..c60c48375ee 100644
--- a/code/game/objects/structures/barricades.dm
+++ b/code/game/objects/structures/barricades.dm
@@ -144,7 +144,8 @@
 	var/image/I
 
 	for(var/i = 1 to 4)
-		I = image('icons/obj/sandbags.dmi', "sandbags[connections?[i] || 0]", dir = 1<<(i-1))
+		var/connect = connections?[i] || 0
+		I = image('icons/obj/sandbags.dmi', "sandbags[connect]", dir = 1<<(i-1))
 		I.color = material.icon_colour
 		add_overlay(I)
 
diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm
index dc73bde9b68..e77abbaa6f2 100644
--- a/code/game/objects/structures/catwalk.dm
+++ b/code/game/objects/structures/catwalk.dm
@@ -51,7 +51,8 @@
 	var/image/I
 	if(!hatch_open)
 		for(var/i = 1 to 4)
-			I = image(icon, "catwalk[connections?[i] || 0]", dir = 1<<(i-1))
+			var/connect = connections?[i] || 0
+			I = image(icon, "catwalk[connect]", dir = 1<<(i-1))
 			add_overlay(I)
 	if(plating_color)
 		I = image(icon, "plated")
diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
index ba73d225022..914c478e17b 100644
--- a/code/modules/tables/tables.dm
+++ b/code/modules/tables/tables.dm
@@ -365,18 +365,21 @@ var/list/table_icon_cache = list()
 		// Standard table image
 		if(material)
 			for(var/i = 1 to 4)
-				var/image/I = get_table_image(icon, "[material.icon_base]_[connections?[i] || 0]", 1<<(i-1), material.icon_colour, 255 * material.opacity)
+				var/connect = connections?[i] || 0
+				var/image/I = get_table_image(icon, "[material.icon_base]_[connect]", 1<<(i-1), material.icon_colour, 255 * material.opacity)
 				add_overlay(I)
 
 		// Reinforcements
 		if(reinforced)
 			for(var/i = 1 to 4)
-				var/image/I = get_table_image(icon, "[reinforced.icon_reinf]_[connections?[i] || 0]", 1<<(i-1), reinforced.icon_colour, 255 * reinforced.opacity)
+				var/connect = connections?[i] || 0
+				var/image/I = get_table_image(icon, "[reinforced.icon_reinf]_[connect]", 1<<(i-1), reinforced.icon_colour, 255 * reinforced.opacity)
 				add_overlay(I)
 
 		if(carpeted)
 			for(var/i = 1 to 4)
-				var/image/I = get_table_image(icon, "carpet_[connections?[i] || 0]", 1<<(i-1))
+				var/connect = connections?[i] || 0
+				var/image/I = get_table_image(icon, "carpet_[connect]", 1<<(i-1))
 				add_overlay(I)
 	else
 		cut_overlays()