Fix <NULL> kill message fix

fixception
Merge pull request #1101 from icomrade/master

Fix <NULL> kill message fix