made death message a bit more context sensitive