Fix the message not being set and crashing