Unnecessary Single Point of Failure

Exactly the sort of thing I was concerned about.