Add error handling, breaking some of the types

It could be! Feel free. I'd like to keep documentation fixes out of this PR unless it's related to it, though.