timob-12176: fix crashing issues