Fix for segmentation fault in CLA [Issue-ID: ODUHIGH-348]