Maybe fixed a bug returning error when a container is not found