Added some tests for this and some more rigorous exceptions across the code (there's a new UnknownClusterException). However there is a race condition that doesn't seem fixable