Fixing issue when nil messages...