diff --git a/code/game/machinery/synth_pod.dm b/code/game/machinery/synth_pod.dm
index 2ee0c4aaf0cd..f933d8e14fc7 100644
--- a/code/game/machinery/synth_pod.dm
+++ b/code/game/machinery/synth_pod.dm
@@ -82,8 +82,8 @@ GLOBAL_LIST_EMPTY(synth_pods)
 		close_machine(target)
 		stored = target
 		update_icon()
-
-		switch_body(target)
+		if(target.client)
+			switch_body(target)
 
 /obj/machinery/synth_pod/proc/switch_body(mob/living/carbon/human/user)
 	var/datum/species/wy_synth/S = user.dna.species
@@ -98,6 +98,12 @@ GLOBAL_LIST_EMPTY(synth_pods)
 			continue
 		if(!pod.stored)
 			continue
+		else
+			var/mob/living/carbon/human/target_synth = pod.stored
+			if(!istype(target_synth))
+				continue
+			if(target_synth.stat == DEAD)
+				continue
 		options["[get_area(pod)] ([pod.x], [pod.y])"] = pod
 
 	var/response = tgui_input_list(user, "Which synthetic unit would you like to transfer into?", "Synthetic Personality Transfer", options)