Fixed client NRE