Refactor to reflect the fact our topology may not be found