diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 3559edc0fb..00d6d3cc70 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -310,8 +310,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			var/obj/machinery/cryopod/C = loc
 			C.despawn_occupant()
 		else
-			ghostize(0, penalize = TRUE, voluntary = TRUE) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
 			suicide_log(TRUE)
+			ghostize(FALSE, penalize = TRUE, voluntary = TRUE) //FALSE parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
+
 
 /mob/camera/verb/ghost()
 	set category = "OOC"
diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm
index d0ad0d3232..62570e7bf3 100644
--- a/modular_citadel/code/modules/mob/cit_emotes.dm
+++ b/modular_citadel/code/modules/mob/cit_emotes.dm
@@ -15,12 +15,10 @@
 
 /datum/emote/living/insult/run_emote(mob/living/user, params)
 	var/insult_message = ""
-	var/miming = user.mind ? user.mind.miming : 0
-	if(!user.is_muzzled())
-		insult_message += pick_list_replacements(INSULTS_FILE, "insult_gen")
-		message = insult_message
-	else if(miming)
+	if(user.mind?.miming)
 		message = "creatively gesticulates."
+	else if(!user.is_muzzled())
+		message = pick_list_replacements(INSULTS_FILE, "insult_gen")
 	else
 		message = "muffles something."
 	. = ..()
@@ -36,7 +34,7 @@
 			sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
 			if(iscyborg(user))
 				var/mob/living/silicon/robot/S = user
-				if(S.cell.charge < 20)
+				if(S.cell?.charge < 20)
 					to_chat(S, "<span class='warning'>Scream module deactivated. Please recharge.</span>")
 					return
 				S.cell.use(200)