Clean up exception handling

And more doc cleanup as well.