Fix potential NPE in CLAC