diff --git a/code/modules/modular_computers/file_system/programs/signaler.dm b/code/modules/modular_computers/file_system/programs/signaler.dm
index ded70f7f37..dfbef9f6d6 100644
--- a/code/modules/modular_computers/file_system/programs/signaler.dm
+++ b/code/modules/modular_computers/file_system/programs/signaler.dm
@@ -57,8 +57,11 @@
var/time = time2text(world.realtime,"hh:mm:ss")
var/turf/T = get_turf(src)
+ if(!istype(T))
+ T = get_turf(usr)
+
var/logging_data
- if(usr)
+ if(usr && T)
logging_data = "[time] : [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) : [format_frequency(signal_frequency)]/[signal_code]"
GLOB.lastsignalers.Add(logging_data)