Remove nil check for messages