BRANCH 4.1-DEV: fix small error when sobject is null