Propagate ContainerNotFoundException appropriately