Merge "Add error logging to DataIntegrityChecker"