Added check for null from upstream change for SCI-1243