[forge-commits] [forge/core] c000ed: Added safe checks