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