Made death messages configurable, with less NPE, this time! :D