SONAR-4421 Fix bulk change issue and error handling issue