in the middle of doc hackery, some exception fixes