Problem with /kill and magic death message

[00J1NX00]

In 2.1, an issue occurred in which death-magic-message was swapped around with the default death message. So when I did /kill, it gave me the magic death message. I swapped the messages around, but now when I die of magic, it crashes the server. According to the critical error report, there’s a problem with line 425 of the code.