Merge "Null check before invoking callback" into sc-dev