Improved handling of 'survey expired' message.