Project: springxd
Issue XD-911: Reduce Sonar Critical Errors 
Should keep the critical error count as close to zero as possible.
Story points: 1