Fixed NPE in DelegatorCL