From 3ec95fe0985c046ff10da35bbcc84fa7b50e670b Mon Sep 17 00:00:00 2001
From: ccomp5950 <ccomp5950@gmail.com>
Date: Mon, 18 Jan 2016 23:51:02 -0500
Subject: [PATCH] Fixes #11998

---
 code/modules/clothing/spacesuits/rig/rig.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index c9d44eb8aad..fcf7d279feb 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -680,8 +680,9 @@
 	..()
 	for(var/piece in list("helmet","gauntlets","chest","boots"))
 		toggle_piece(piece, user, ONLY_RETRACT)
-	wearer.wearing_rig = null
-	wearer = null
+	if(wearer)
+		wearer.wearing_rig = null
+		wearer = null
 
 //Todo
 /obj/item/weapon/rig/proc/malfunction()