[forge-commits] [forge/core] acef0e: Added null-safe check