diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 2bffdd4415f..c2b2ad1e3de 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -414,8 +414,9 @@
 	to_chat(cyborg, "<span class='notice'>The floor buffer is now [cyborg.floorbuffer ? "active" : "deactivated"].</span>")
 
 /obj/item/borg/upgrade/floorbuffer/Destroy()
-	cyborg.floorbuffer = FALSE
-	cyborg = null
+	if(cyborg)
+		cyborg.floorbuffer = FALSE
+		cyborg = null
 	return ..()
 
 /obj/item/borg/upgrade/bluespace_trash_bag