diff --git a/code/modules/mob/dead/observer/logout.dm b/code/modules/mob/dead/observer/logout.dm
index 22c272a654e..f8c61f56244 100644
--- a/code/modules/mob/dead/observer/logout.dm
+++ b/code/modules/mob/dead/observer/logout.dm
@@ -1,5 +1,6 @@
 /mob/dead/observer/Logout()
-	client.images -= ghostimages
+	if (client)
+		client.images -= ghostimages
 	..()
 	spawn(0)
 		if(src && !key)	//we've transferred to another mob. This ghost should be deleted.