[forge-commits] [forge/core] cc9246: Added null check