Move raising of container-not-found exception to base class