Tidy up exception message on breaking the sandpit.
Fix reporting detected name of repo.