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()