diff --git a/code/datums/sound_player.dm b/code/datums/sound_player.dm
index bfd7b18b1cc..72293e283cf 100644
--- a/code/datums/sound_player.dm
+++ b/code/datums/sound_player.dm
@@ -221,7 +221,9 @@ GLOBAL_DATUM_INIT(sound_player, /decl/sound_player, new)
 	var/turf/source_turf = get_turf(source)
 	var/turf/listener_turf = get_turf(listener)
 
-	ASSERT(istype(source_turf) && istype(listener_turf))
+	if(!istype(source_turf) && !istype(listener_turf)) // Oh look somebody's got nullspace'd
+		PrivRemoveListener(listener)
+		return
 
 	var/distance = get_dist(source_turf, listener_turf)
 	if(!listener_turf || (distance > range) || !(listener_turf in can_be_heard_from))
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 40362a34862..f88eef0a9fa 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -50,7 +50,7 @@ GLOBAL_LIST_EMPTY(clothing_blood_icons)
 	if(slot == slot_l_hand_str || slot == slot_r_hand_str)
 		return
 
-	var/image/ret = .
+	var/image/ret = . ? . : image('icons/effects/blank.dmi')
 
 	if(ishuman(user_mob))
 		var/mob/living/carbon/human/user_human = user_mob