diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 2e56b963e88f..bdeb60c4ae98 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -39,7 +39,8 @@
 		msg_admin_niche("[key]/[ckey] has tried to transfer to deleted [new_character].")
 		return
 
-	SEND_SIGNAL(current.client, COMSIG_CLIENT_MIND_TRANSFER, new_character)
+	if(current.client)
+		SEND_SIGNAL(current.client, COMSIG_CLIENT_MIND_TRANSFER, new_character)
 
 	if(current)
 		current.mind = null //remove ourself from our old body's mind variable
diff --git a/code/datums/tutorial/marine/medical_basic.dm b/code/datums/tutorial/marine/medical_basic.dm
index c5b872db43be..7aa1a310a997 100644
--- a/code/datums/tutorial/marine/medical_basic.dm
+++ b/code/datums/tutorial/marine/medical_basic.dm
@@ -165,9 +165,6 @@
 	. = ..()
 	arm_equipment(tutorial_mob, /datum/equipment_preset/tutorial/fed)
 
-	TUTORIAL_ATOM_FROM_TRACKING(/obj/structure/machinery/cryopod/tutorial, tutorial_pod)
-	tutorial_pod.go_in_cryopod(tutorial_mob, TRUE, FALSE)
-
 
 /datum/tutorial/marine/medical_basic/init_map()
 	new /obj/structure/surface/table/almayer(loc_from_corner(0, 4))