[OE-5270] fixed crashes