TRUNK-4236: SonarQube - Redundant nullcheck of value known to be non-null