Fix dying to blank messages