diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 7425dc65efe..83f6e4e4ff8 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -232,6 +232,9 @@ SUBSYSTEM_DEF(throwing) if (callback) callback.Invoke() + // Same can happen in the callback + if(QDELETED(thrownthing)) + return if(!thrownthing.currently_z_moving) // I don't think you can zfall while thrown but hey, just in case. var/turf/T = get_turf(thrownthing)