added container name guard