REVIEW-1394: remove unnecessary null handling