moved death message handling to correct spot