[LFTILI-90] fixing some seg fault potential areas