[TIMOB-16782] Fixed more crashes