minor formatting. Adding null reference check to CreateContainer(...)