diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm
index 82f1ffc2ceb..06bc251fe9e 100644
--- a/code/modules/mob/living/default_language.dm
+++ b/code/modules/mob/living/default_language.dm
@@ -2,7 +2,7 @@
set name = "Set Default Language"
set category = "IC"
- if(!(language in languages))
+ if(!(language in languages) && !isnull(language))
to_chat(src, "You don't seem to know how to speak [language].")
return
if(language)
@@ -16,7 +16,7 @@
set name = "Set Default Language"
set category = "IC"
- if(!(language in speech_synthesizer_langs))
+ if(!(language in speech_synthesizer_langs) && !isnull(language))
to_chat(src, "You don't seem to know how to speak [language].")
return
if(language)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index f4eb4cbe3e6..fde5e123e6b 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -792,6 +792,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
src:cameraFollow = null
/mob/Topic(href, href_list)
+ if(href_list["flavor_more"])
+ usr << browse(text("[][]", name, replacetext(flavor_text, "\n", "
")), "window=[name];size=500x200")
+ onclose(usr, "[name]")
+ if(href_list["flavor_change"])
+ update_flavor_text()
+
if(usr != src)
return TRUE
if(..())
@@ -801,11 +807,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
unset_machine()
src << browse(null, t1)
- if(href_list["flavor_more"])
- usr << browse(text("[][]", name, replacetext(flavor_text, "\n", "
")), "window=[name];size=500x200")
- onclose(usr, "[name]")
- if(href_list["flavor_change"])
- update_flavor_text()
if(href_list["scoreboard"])
usr << browse(GLOB.scoreboard, "window=roundstats;size=500x600")