Fix NRE in PCL Clients