[TIMOB-12305] Avoid crashing and 2.2