TS-2820: Adding another check for crash