errors -> exception, actually get it running again.

Really need to write an integration test, which is forthcoming.