Added check for if message is empty