diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 52c56ccb17..94032dcba3 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -341,6 +341,7 @@
var/mob/living/carbon/C = usr
C.swap_hand()
else
- var/turf/T = screen_loc2turf("screen-loc", get_turf(usr))
- T.Click(location, control, params)
+ var/turf/T = screen_loc2turf(screen_loc, get_turf(usr))
+ if(T)
+ T.Click(location, control, params)
. = 1
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index fad3c7de1b..500b2a80bc 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1452,6 +1452,7 @@
if(stat) return
var/datum/category_group/underwear/UWC = input(usr, "Choose underwear:", "Show/hide underwear") as null|anything in global_underwear.categories
+ if(!UWC) return
var/datum/category_item/underwear/UWI = all_underwear[UWC.name]
if(!UWI || UWI.name == "None")
src << "You do not have [UWC.gender==PLURAL ? "[UWC.display_name]" : "\a [UWC.display_name]"]."
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 350aab3414..29a62f6f36 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -180,7 +180,7 @@
update_icon()
else
usr << "You need to hold it in hands!"
- if (istype(src.loc, /mob) ||istype(src.loc.loc, /mob))
+ if (src.loc && istype(src.loc, /mob) ||istype(src.loc.loc, /mob))
src.attack_self(usr)
updateUsrDialog()