diff --git a/code/__HELPERS/hearted.dm b/code/__HELPERS/hearted.dm
index 7ff125f2436..58b52603e34 100644
--- a/code/__HELPERS/hearted.dm
+++ b/code/__HELPERS/hearted.dm
@@ -6,10 +6,10 @@
 
 	for(var/i in GLOB.joined_player_list)
 		var/mob/check_mob = get_mob_by_ckey(i)
-		if(!check_mob || !check_mob.mind || !check_mob.client)
+		if(!check_mob?.mind || !check_mob.client)
 			continue
 		// maybe some other filters like bans or whatever
-		check_mob.query_heart(1)
+		INVOKE_ASYNC(check_mob, /mob.proc/query_heart, 1)
 		number_to_ask--
 		if(number_to_ask == 0)
 			break
@@ -49,6 +49,7 @@
 	if(isnull(heart_nominee) || heart_nominee == "")
 		return
 
+	heart_nominee = lowertext(heart_nominee)
 	var/list/name_checks = get_mob_by_name(heart_nominee)
 	if(!name_checks || name_checks.len == 0)
 		query_heart(attempt + 1)
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 717409bc8f7..ff5512328ae 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -384,7 +384,7 @@
 				launch_status = ENDGAME_LAUNCHED
 				setTimer(SSshuttle.emergencyEscapeTime * engine_coeff)
 				priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, null, "Priority")
-				SSticker.poll_hearts()
+				INVOKE_ASYNC(SSticker, /datum/controller/subsystem/ticker.proc/poll_hearts)
 				SSmapping.mapvote() //If no map vote has been run yet, start one.
 
 		if(SHUTTLE_STRANDED)