diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 25219809e5..83e6c6e642 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -281,8 +281,8 @@
 		booting_R.icon_state = "boot_load"
 		animate(booting_L, alpha=230, time=30, easing=SINE_EASING)
 		animate(booting_R, alpha=200, time=20, easing=SINE_EASING)
-		M.client.screen += booting_L
-		M.client.screen += booting_R
+		M.client?.screen += booting_L
+		M.client?.screen += booting_R
 
 	canremove = 0 // No removing the suit while unsealing.
 	sealing = 1
@@ -358,8 +358,8 @@
 	sealing = null
 
 	if(failed_to_seal)
-		M.client.screen -= booting_L
-		M.client.screen -= booting_R
+		M.client?.screen -= booting_L
+		M.client?.screen -= booting_R
 		qdel(booting_L)
 		qdel(booting_R)
 		for(var/obj/item/piece in list(helmet,boots,gloves,chest))
@@ -380,11 +380,11 @@
 			minihud = new (M.hud_used, src)
 	to_chat(M, "<span class='notice'><b>Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].</b></span>")
 	playsound(src, 'sound/machines/rig/rigstarted.ogg', 10, FALSE)
-	M.client.screen -= booting_L
+	M.client?.screen -= booting_L
 	qdel(booting_L)
 	booting_R.icon_state = "boot_done"
 	spawn(40)
-		M.client.screen -= booting_R
+		M.client?.screen -= booting_R
 		qdel(booting_R)
 
 	if(canremove)
@@ -595,7 +595,7 @@
 		// Since setting mob_icon will override the species checks in
 		// update_inv_wear_suit(), handle species checks here.
 		if(wearer && LAZYACCESS(sprite_sheets, wearer.species.get_bodytype(wearer)))
-			species_icon =  sprite_sheets[wearer.species.get_bodytype(wearer)]
+			species_icon = sprite_sheets[wearer.species.get_bodytype(wearer)]
 		mob_icon = icon(icon = species_icon, icon_state = "[icon_state]")
 
 	if(installed_modules.len)