More robust post-deployment check (OMS-345)