Sonar critical violation - fixed 'Equals Null'