Have you made sure we can rely on the repository existing even though we're not keeping a reference to it?