Fix multiple death reports

I shouldn't put two things into a single pull request but meh :/

First commit is a minor missing include. Second one is the actual purpose of this pull-request, see commit-message for details.