fix(null-check): add a null-check

related to CAM-3189