[TIMOB-18097]: Fix CLI crashes