[PLAT-6708] Adding more checks to make it more resilient