diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index e8297662c85..ce33b9097f4 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -342,5 +342,6 @@ C.swap_hand() else var/turf/T = screen_loc2turf(modifiers["screen-loc"], get_turf(usr)) - T.Click(location, control, params) + if(T) + T.Click(location, control, params) return 1