Fix null pointer issue with promotion