[forge-commits] [forge/core] c53ed4: Fixed possible NPE