FORGE-1460 Fix NPE in CLAC