Hardened logic in case of broken containers. FABRIC-1186