diff --git a/code/datums/weakrefs.dm b/code/datums/weakrefs.dm index 09193aea57..8af2491451 100644 --- a/code/datums/weakrefs.dm +++ b/code/datums/weakrefs.dm @@ -16,4 +16,4 @@ /datum/weakref/proc/resolve() var/datum/D = locate(reference) - return D.weak_reference == src? D : null + return (!QDELETED(D) && D.weak_reference == src) ? D : null