Make integrity agent freqently check for conflicts. Improve error handling.