SWC-1301: only set if not null