Fixed bug with empty message