Added checking to see if container exists.