Adapt to handle new country code error case, and some messages from WB.