PRD-4613: NPE fixed