Hardened logic in case of broken containers. FABRIC-1186
Merge pull request #1706 from paoloantinori/property-not-resolved_FABRIC-1186

Hardened logic in case of broken containers. FABRIC-1186