Fix more NRE in HasElectricCharge