Fix null rawConfig issue