diff --git a/baystation12.int b/baystation12.int
index 29f9e64646a..b82874fded5 100644
--- a/baystation12.int
+++ b/baystation12.int
@@ -1,5 +1,6 @@
 // BEGIN_INTERNALS
 /*
+MAP_ICON_TYPE: 0
 AUTO_FILE_DIR: OFF
 */
 // END_INTERNALS
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 84bb23a5746..58ed13b9d9d 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -348,6 +348,7 @@
 
 
 /obj/structure/table/attackby(obj/item/W as obj, mob/user as mob)
+	if (!W) return
 	if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
 		var/obj/item/weapon/grab/G = W
 		if (istype(G.affecting, /mob/living))