Improved handling of condition messages.