diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 0a113859c3..5c93d3a7e8 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -335,8 +335,10 @@ field_generator power level display
if(O.last_warning && temp)
if((world.time - O.last_warning) > 50) //to stop message-spam
temp = 0
- message_admins("A singulo exists and a containment field has failed.",1)
- investigate_log("has failed whilst a singulo exists.", INVESTIGATE_SINGULO)
+ var/turf/T = get_turf(src)
+ var/area/A = get_area(T)
+ message_admins("A singulo exists and a containment field has failed at [A] [ADMIN_COORDJMP(T)].")
+ investigate_log("has failed whilst a singulo exists at [A] [COORD(T)].", INVESTIGATE_SINGULO)
O.last_warning = world.time
/obj/machinery/field/generator/shock(mob/living/user)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 2a7fd37c65..06260d1b12 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -128,11 +128,13 @@
/obj/singularity/proc/admin_investigate_setup()
+ var/turf/T = get_turf(src)
+ var/area/A = get_area(T)
last_warning = world.time
var/count = locate(/obj/machinery/field/containment) in urange(30, src, 1)
if(!count)
- message_admins("A singulo has been created without containment fields active ([x],[y],[z])",1)
- investigate_log("was created. [count?"":"No containment fields were active"]", INVESTIGATE_SINGULO)
+ message_admins("A singulo has been created without containment fields active at [A] [ADMIN_COORDJMP(T)].")
+ investigate_log("was created at [A] [COORD(T)]. [count?"":"No containment fields were active"]", INVESTIGATE_SINGULO)
/obj/singularity/proc/dissipate()
if(!dissipate)