check for existence of containers first
Merge pull request #12491 from UtahDave/develop

check for existence of containers first