Attemted to fix NPE's in death events.