Client no longer manages own singleton, exception classes slimmed down to one