- more fixes for empty message info