From 8eaba9f40f31b76bf3471dd2212217259e44fa5b Mon Sep 17 00:00:00 2001
From: Henri215 <77684085+Henri215@users.noreply.github.com>
Date: Thu, 10 Aug 2023 16:18:53 -0300
Subject: [PATCH] Fixes a floor thing (#21962)

---
 code/game/objects/items/robot/robot_upgrades.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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